diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
index ec3bbf339d9920366069b620809eff4e28deb3e7..540e5ac07739f0524bb0296de3a9505762c3ee0e 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
@@ -23,6 +23,8 @@
     <include relativeToChangelogFile="true" file="struct/create_asys_roles.xml"/>
     <include relativeToChangelogFile="true" file="struct/create_asys_roles_children.xml"/>
     <include relativeToChangelogFile="true" file="struct/create_asys_usertoken.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_asys_record.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_asys_recordgroup.xml"/>
     <include relativeToChangelogFile="true" file="data/insert_asys_aliasconfig.xml"/>
     <include relativeToChangelogFile="true" file="data/insert_asys_system.xml"/>
     <include relativeToChangelogFile="true" file="data/insert_asys_permissionset.xml"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d6a080ec20a9b0b48c879c36c3c009a78438c90
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_record.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="a.schindlbeck" id="55fc4812-a4b7-4a53-a369-8b644ec78cae">
+    <createTable tableName="ASYS_RECORD">
+        <column name="ID" type="CHAR(36)">
+            <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_ID"/>
+        </column>
+        <column name="OBJECT_TYPE" type="VARCHAR(64)"/>
+        <column name="ROW_ID" type="CHAR(36)"/>
+        <column name="RECORDGROUP_ID" type="CHAR(36)"/>
+    </createTable>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..189f0040b10ec5e943c20eb6eff5f073140d06f9
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_recordgroup.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="a.schindlbeck" id="56a34dfc-3c0d-48e1-8890-31c0c93f1942">
+    <createTable tableName="ASYS_RECORDGROUP">
+        <column name="ID" type="CHAR(36)">
+            <constraints primaryKey="true" primaryKeyName="PK_ASYS_RECORD_GROUP_ID"/>
+        </column>
+        <column name="USER_ID" type="CHAR(46)"/>
+        <column name="TITLE" type="VARCHAR(256)"/>
+        <column name="GROUP_TYPE" type="VARCHAR(64)"/>
+    </createTable>
+</changeSet>
+</databaseChangeLog>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 875ad026d6d26f22daffee578b7e83c580b1639e..4cd0514b5c6a0c530b8a0b928b4942bbf0a38849 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1102,6 +1102,10 @@
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
+    <entityField>
+      <name>OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e359dfbd05a73d0010c8e90a0a645160e0087e4
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 61aa30e669c5d98bfa405cc9fb26e8848dfa290c..6fd625f50dd19ce5a6e0415fdb93a9cd15721001 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1266,6 +1266,10 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityField>
+      <name>OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/objecttype/valueProcess.js b/entity/Person_entity/entityfields/objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1a62719874bc1128e2a2f8e5924f789c4b38e0c
--- /dev/null
+++ b/entity/Person_entity/entityfields/objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result")
+
+result.string("Person");
\ No newline at end of file
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 77fbb80ddc792f0e9d24c977c3a03ffa887f84b2..63fb9474aec50b700fb793b31044b5b3decfd3c2 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -19,6 +19,18 @@
       <entityField>#ENTITY</entityField>
       <informationField>COMMRESTRICTIONS_ACTIVE</informationField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorite</name>
+      <objectType>OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+    </favoriteViewTemplate>
     <neonViewReference>
       <name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
       <entityField>Communications</entityField>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 4f02cea4c0270be1453cc2bfa738afe39e9bc689..17032aac82178b7304d5f61f40f81c6ad94b113a 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -19,6 +19,18 @@
       <entityField>#ENTITY</entityField>
       <informationField>COMMRESTRICTIONS_ACTIVE</informationField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>OBJECTTYPE</objectType>
+      <rowId>#UID</rowId>
+      <entityField>#ENTITY</entityField>
+      <title>favorites</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+    </favoriteViewTemplate>
     <neonViewReference>
       <name>5a1b7683-2fec-4763-9b45-e4c7a18d70fd</name>
       <entityField>Communications</entityField>