diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 5498a5756e3183073dbe31c59376912dc6851b37..67b2b94eabf4e3ef25b7e0b90e4b041be6573997 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -175,5 +175,7 @@
<include relativeToChangelogFile="true" file="AditoBasic/insert_permission_keyword.xml"/>
<include relativeToChangelogFile="true" file="create_DSGVO.xml"/>
+ <include relativeToChangelogFile="true" file="init_dsgvouse.xml"/>
+ <include relativeToChangelogFile="true" file="init_dsgvoright.xml"/>
</databaseChangeLog>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 2604ccd28c995b820b47daae8e0b7b84cfe47368..b3da45a9b825c62e6c78dd3fe3c582d5086f27ab 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -141,6 +141,12 @@
<fieldName>ContactAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>87260b21-5c3f-452c-9a0b-d3f5dcf7637d</name>
+ <entityName>DSGVO_entity</entityName>
+ <fieldName>ContactAdresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index 5681d8f103272b58898effd64ed46c0bd4cf34ba..7763b0c2b07b551ecad93a54483c2fc4e51299b4 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -35,11 +35,13 @@
<entityField>
<name>RIGHT</name>
<title>DataPrivacy Right</title>
+ <consumer>KeywordRight</consumer>
<mandatory v="true" />
</entityField>
<entityField>
<name>USE</name>
<title>DataPrivacy Use</title>
+ <consumer>KeywordUse</consumer>
<mandatory v="true" />
</entityField>
<entityField>
@@ -53,6 +55,45 @@
<name>CONTACT_ID</name>
<linkedContext>Default_context</linkedContext>
</entityField>
+ <entityConsumer>
+ <name>ContactAdresses</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>ContactAddresses</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordUse</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keyworduse/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordRight</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keywordright/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DSGVO_entity/entityfields/keywordright/children/containername_param/valueProcess.js b/entity/DSGVO_entity/entityfields/keywordright/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ecc628d1e190281f67fae93800af14ff61f4c8d
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/keywordright/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.DSGVORight());
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/keyworduse/children/containername_param/valueProcess.js b/entity/DSGVO_entity/entityfields/keyworduse/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6805dc6c2c378b8ff8cd891e1117ddd7a3161779
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/keyworduse/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.DSGVOUse());
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/right/displayValueProcess.js b/entity/DSGVO_entity/entityfields/right/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa353b3a4098e0f750b45644dadaa8e6e53e8ac2
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/right/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVORight(), vars.get("$field.RIGHT")));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/use/displayValueProcess.js b/entity/DSGVO_entity/entityfields/use/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..244c7f20cc66a4f36e7df3d6b920c23c61340775
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/use/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.DSGVOUse(), vars.get("$field.USE")));
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index b4b9660d0b0eae968e4671097549231b0674ffe7..7fa73f1f96d4654ac3c689637fe4d1af598bc083 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -392,6 +392,18 @@
<fieldName>KeywordClassificationTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>3ab18dc8-b702-49d9-9cbc-4b8d8ffaea2e</name>
+ <entityName>DSGVO_entity</entityName>
+ <fieldName>KeywordUse</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>86501073-4e62-42ef-ba15-e9f6a2eb3495</name>
+ <entityName>DSGVO_entity</entityName>
+ <fieldName>KeywordRight</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 4dd51001554d5c3a77823c584e694c2802bbaba1..1543241eb2bdcd195bd82955474711b89ec182f3 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -100,4 +100,6 @@ $KeywordRegistry.classificationType$salesproject = function(){return "968eafa3-3
$KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.personGender$other = function(){return "o";};
$KeywordRegistry.permissionCondType = function(){return "PermissionCondType";};
-$KeywordRegistry.permissionAccessType = function(){return "PermissionAccessType";};
\ No newline at end of file
+$KeywordRegistry.permissionAccessType = function(){return "PermissionAccessType";};
+$KeywordRegistry.DSGVOUse = function(){return "DSGVOUse";};
+$KeywordRegistry.DSGVORight = function(){return "DSGVORight";};
\ No newline at end of file