diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index bf7d04e0669d68101bf089f17b92416ee792afab..996787f5f7864479cf66ed7ed355b5ccc369b15a 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -8,6 +8,15 @@
   <recordContainerType>DB</recordContainerType>
   <alias>Data_alias</alias>
   <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess>
+  <recordContainer>db</recordContainer>
+  <linkInformation>
+    <linkInformation>
+      <name>a0278c8c-4d5a-4ac9-b0eb-fec72f9e8576</name>
+      <tableName>ADDRESS</tableName>
+      <primaryKey>ADDRESSID</primaryKey>
+      <isUIDTable v="true" />
+    </linkInformation>
+  </linkInformation>
   <entityFields>
     <entityField>
       <name>ADDRESS</name>
@@ -192,12 +201,89 @@ This is needed because you want to modify the record itself for setting the stan
 If this is &amp;quot;false&amp;quot;, you cannot create od delete records or change the actual address-data, e.g. zip-code, address, buildingno, etc.</description>
     </entityParameter>
   </entityFields>
-  <linkInformation>
-    <linkInformation>
-      <name>a0278c8c-4d5a-4ac9-b0eb-fec72f9e8576</name>
-      <tableName>ADDRESS</tableName>
-      <primaryKey>ADDRESSID</primaryKey>
-      <isUIDTable v="true" />
-    </linkInformation>
-  </linkInformation>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
+          <tableName>ADDRESS</tableName>
+          <primaryKey>ADDRESSID</primaryKey>
+          <isUIDTable v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADDRESS.value</name>
+          <value>ADDRESS.ADDRESS</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CITY.value</name>
+          <value>ADDRESS.CITY</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESSADDITION.value</name>
+          <value>ADDRESS.ADDRESSADDITION</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COUNTRY.value</name>
+          <value>ADDRESS.COUNTRY</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESSID.value</name>
+          <value>ADDRESS.ADDRESSID</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <value>ADDRESS.DATE_EDIT</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRIDENTIFIER.value</name>
+          <value>ADDRESS.ADDRIDENTIFIER</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <value>ADDRESS.DATE_NEW</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDR_TYPE.value</name>
+          <value>ADDRESS.ADDR_TYPE</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT.value</name>
+          <value>ADDRESS.DISTRICT</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>BUILDINGNO.value</name>
+          <value>ADDRESS.BUILDINGNO</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REGION.value</name>
+          <value>ADDRESS.REGION</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RELATION_ID.value</name>
+          <value>ADDRESS.RELATION_ID</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <value>ADDRESS.STATE</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <value>ADDRESS.USER_EDIT</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <value>ADDRESS.USER_NEW</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ZIP.value</name>
+          <value>ADDRESS.ZIP</value>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
 </entity>
diff --git a/entity/Address_entity/recordcontainers/db/conditionProcess.js b/entity/Address_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ee6a70eb73ceb8666f4e765a793f3cd5ad8ab65
--- /dev/null
+++ b/entity/Address_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
+    result.string("ADDRESS.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");  
+else
+    result.string("1 = 2");  
\ No newline at end of file