diff --git a/demo/complex2/midpoint-objects/objectTemplates/template-org-affiliation.xml b/demo/complex2/midpoint-objects/objectTemplates/template-org-affiliation.xml
index 00abb98..672f948 100644
--- a/demo/complex2/midpoint-objects/objectTemplates/template-org-affiliation.xml
+++ b/demo/complex2/midpoint-objects/objectTemplates/template-org-affiliation.xml
@@ -3,6 +3,7 @@
     oid="d87aa04f-189c-4d6f-b6e1-216dad622142">
     <name>template-org-affiliation</name>
     <mapping>
+        <name>metarole</name>
         <strength>strong</strength>
         <expression>
             <assignmentTargetSearch>
@@ -14,4 +15,55 @@
             <path>assignment</path>
         </target>
     </mapping>
+    <item>
+        <ref>identifier</ref>
+        <mapping>
+            <name>identifier</name>
+            <strength>strong</strength>
+            <source>
+                <path>extension/grouperName</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        grouperName?.substring(16)           // from ref:affiliation:xxx
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>name</ref>
+        <mapping>
+            <name>name</name>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        'affiliation_' + identifier
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>displayName</ref>
+        <mapping>
+            <name>displayName</name>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        'Affiliation: ' + identifier
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
 </objectTemplate>
diff --git a/demo/complex2/midpoint-objects/objectTemplates/template-org-course.xml b/demo/complex2/midpoint-objects/objectTemplates/template-org-course.xml
index 46aada3..bec4c40 100644
--- a/demo/complex2/midpoint-objects/objectTemplates/template-org-course.xml
+++ b/demo/complex2/midpoint-objects/objectTemplates/template-org-course.xml
@@ -14,4 +14,45 @@
             <path>assignment</path>
         </target>
     </mapping>
+    <item>
+        <ref>identifier</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>extension/grouperName</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        grouperName?.substring(11)           // from ref:course:xxx
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>name</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        'course_' + identifier
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>displayName</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+        </mapping>
+    </item>
 </objectTemplate>
\ No newline at end of file
diff --git a/demo/complex2/midpoint-objects/objectTemplates/template-org-department.xml b/demo/complex2/midpoint-objects/objectTemplates/template-org-department.xml
index d011bde..6320e23 100644
--- a/demo/complex2/midpoint-objects/objectTemplates/template-org-department.xml
+++ b/demo/complex2/midpoint-objects/objectTemplates/template-org-department.xml
@@ -14,4 +14,45 @@
             <path>assignment</path>
         </target>
     </mapping>
+    <item>
+        <ref>identifier</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>extension/grouperName</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        grouperName?.substring(9)           // from ref:dept:xxx
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>name</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        'department_' + identifier
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>displayName</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+        </mapping>
+    </item>    
 </objectTemplate>
\ No newline at end of file
diff --git a/demo/complex2/midpoint-objects/objectTemplates/template-org-generic-group.xml b/demo/complex2/midpoint-objects/objectTemplates/template-org-generic-group.xml
index ff415f6..3492c5a 100644
--- a/demo/complex2/midpoint-objects/objectTemplates/template-org-generic-group.xml
+++ b/demo/complex2/midpoint-objects/objectTemplates/template-org-generic-group.xml
@@ -14,4 +14,38 @@
             <path>assignment</path>
         </target>
     </mapping>
+    <item>
+        <ref>identifier</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>extension/grouperName</path>
+            </source>
+        </mapping>
+    </item>
+    <item>
+        <ref>name</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        'generic_' + identifier
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>displayName</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+        </mapping>
+    </item>    
 </objectTemplate>
diff --git a/demo/complex2/midpoint-objects/objectTemplates/template-org-mailing-list.xml b/demo/complex2/midpoint-objects/objectTemplates/template-org-mailing-list.xml
index cef6b9d..04c339e 100644
--- a/demo/complex2/midpoint-objects/objectTemplates/template-org-mailing-list.xml
+++ b/demo/complex2/midpoint-objects/objectTemplates/template-org-mailing-list.xml
@@ -14,4 +14,52 @@
             <path>assignment</path>
         </target>
     </mapping>
-</objectTemplate>
+    <item>
+        <ref>identifier</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>extension/grouperName</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        grouperName?.substring(16)           // from app:mailinglist:xxx
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>name</ref>
+        <mapping>
+            <strength>strong</strength>
+            <source>
+                <path>identifier</path>
+            </source>
+            <expression>
+                <script>
+                    <code>
+                        'mailinglist_' + identifier
+                    </code>
+                </script>
+            </expression>
+        </mapping>
+    </item>
+    <item>
+        <ref>displayName</ref>
+        <mapping>
+            <strength>strong</strength>
+            <expression>
+                <script>
+                    <code>
+                        'Mailing list: ' + identifier
+                    </code>
+                </script>
+            </expression>
+            <source>
+                <path>identifier</path>
+            </source>
+        </mapping>
+    </item>    
+</objectTemplate>
\ No newline at end of file
diff --git a/demo/complex2/midpoint-objects/objectTemplates/template-user.xml b/demo/complex2/midpoint-objects/objectTemplates/template-user.xml
index 633369a..d381aaa 100644
--- a/demo/complex2/midpoint-objects/objectTemplates/template-user.xml
+++ b/demo/complex2/midpoint-objects/objectTemplates/template-user.xml
@@ -5,57 +5,13 @@
         <strength>strong</strength>
         <source>
             <path>extension/grouperGroup</path>
-            <set>
-                <condition>
-                    <script>
-                        <code>
-                            !(grouperGroup ==~ /ref:affiliation:.*/) &amp;&amp; !(grouperGroup ==~ /app:mailinglist:.*/)
-                        </code>
-                    </script>
-                </condition>
-            </set>
         </source>
         <expression>
             <assignmentTargetSearch>
                 <targetType>OrgType</targetType>
                 <filter>
                     <q:equal>
-                        <q:path>name</q:path>                       
-                        <expression>
-                            <script>
-                                <code>
-                                    'generic_' + grouperGroup
-                                </code>
-                            </script>
-                        </expression>
-                    </q:equal>
-                </filter>
-                <assignmentProperties>
-                    <subtype>generic-group</subtype>
-                </assignmentProperties>
-                <createOnDemand>true</createOnDemand>
-                <populateObject>
-                    <populateItem>
-                        <target>
-                            <path>name</path>
-                        </target>
-                        <expression>
-                            <script>
-                                <code>
-                                    'generic_' + grouperGroup
-                                </code>
-                            </script>
-                        </expression>
-                    </populateItem>
-                    <populateItem>
-                        <target>
-                            <path>subtype</path>
-                        </target>
-                        <expression>
-                            <value>generic-group</value>
-                        </expression>
-                    </populateItem>
-                    <populateItem>
+                        <q:path>extension/grouperName</q:path>                       
                         <expression>
                             <script>
                                 <code>
@@ -63,172 +19,41 @@
                                 </code>
                             </script>
                         </expression>
-                        <target>
-                            <path>identifier</path>
-                        </target>
-                    </populateItem>
-                </populateObject>
-            </assignmentTargetSearch>       
-        </expression>
-        <target>
-            <path>assignment</path>
-            <set>
-                <condition>
-                    <script>
-                        <code>
-                            assignment?.subtype.contains('generic-group')
-                        </code>
-                    </script>
-                </condition>
-            </set>
-        </target>
-    </mapping>
-    <mapping>
-        <strength>strong</strength>
-        <source>
-            <path>extension/grouperGroup</path>
-            <set>
-                <condition>
-                    <script>
-                        <code>
-                            grouperGroup ==~ /app:mailinglist:.*/
-                        </code>
-                    </script>
-                </condition>
-            </set>
-        </source>
-        <expression>
-            <assignmentTargetSearch>
-                <targetType>OrgType</targetType>
-                <filter>
-                    <q:equal>
-                        <q:path>name</q:path>                       
-                        <expression>
-                            <script>
-                                <code>
-                                    'mailinglist_' + grouperGroup.substring(16)
-                                </code>
-                            </script>
-                        </expression>
                     </q:equal>
                 </filter>
                 <assignmentProperties>
-                    <subtype>mailing-list</subtype>
+                    <subtype>grouper-group</subtype>
                 </assignmentProperties>
                 <createOnDemand>true</createOnDemand>
                 <populateObject>
-                    <populateItem>
-                        <target>
-                            <path>name</path>
-                        </target>
-                        <expression>
-                            <script>
-                                <code>
-                                    'mailinglist_' + grouperGroup.substring(16)
-                                </code>
-                            </script>
-                        </expression>
-                    </populateItem>
                     <populateItem>
                         <target>
                             <path>subtype</path>
                         </target>
-                        <expression>
-                            <value>mailing-list</value>
-                        </expression>
-                    </populateItem>
-                    <populateItem>
-                        <expression>
-                            <script>
-                                <code>
-                                    grouperGroup
-                                </code>
-                            </script>
-                        </expression>
-                        <target>
-                            <path>identifier</path>
-                        </target>
-                    </populateItem>
-                </populateObject>
-            </assignmentTargetSearch>       
-        </expression>
-        <target>
-            <path>assignment</path>
-            <set>
-                <condition>
-                    <script>
-                        <code>
-                            assignment?.subtype.contains('mailing-list')
-                        </code>
-                    </script>
-                </condition>
-            </set>
-        </target>
-    </mapping>
-    <mapping>
-        <strength>strong</strength>
-        <source>
-            <path>extension/grouperGroup</path>
-            <set>
-                <condition>
-                    <script>
-                        <code>
-                            grouperGroup ==~ /ref:affiliation:.*/
-                        </code>
-                    </script>
-                </condition>
-            </set>
-        </source>
-        <expression>
-            <assignmentTargetSearch>
-                <targetType>OrgType</targetType>
-                <filter>
-                    <q:equal>
-                        <q:path>name</q:path>                       
-                        <expression>
-                            <script>
-                                <code>
-                                    'affiliation_' + grouperGroup.substring(16)
-                                </code>
-                            </script>
-                        </expression>
-                    </q:equal>
-                </filter>
-                <assignmentProperties>
-                    <subtype>affiliation</subtype>
-                </assignmentProperties>
-                <createOnDemand>true</createOnDemand>
-                <populateObject>
-                    <populateItem>
-                        <target>
-                            <path>name</path>
-                        </target>
                         <expression>
                             <script>
                                 <code>
-                                    'affiliation_' + grouperGroup.substring(16)
+                                    switch (grouperGroup) {
+                                        case ~/ref:affiliation:.*/: return 'affiliation'
+                                        case ~/ref:dept:.*/: return 'department'
+                                        case ~/ref:course:.*/: return 'course'
+                                        case ~/app:mailinglist:.*/: return 'mailing-list'
+                                        default: return 'generic-group'
+                                    }
                                 </code>
                             </script>
                         </expression>
                     </populateItem>
-                    <populateItem>
-                        <target>
-                            <path>subtype</path>
-                        </target>
-                        <expression>
-                            <value>affiliation</value>
-                        </expression>
-                    </populateItem>
                     <populateItem>
                         <expression>
                             <script>
                                 <code>
-                                    grouperGroup.substring(16)
+                                    grouperGroup
                                 </code>
                             </script>
                         </expression>
                         <target>
-                            <path>identifier</path>
+                            <path>extension/grouperName</path>
                         </target>
                     </populateItem>
                 </populateObject>
@@ -240,7 +65,7 @@
                 <condition>
                     <script>
                         <code>
-                            assignment?.subtype.contains('affiliation')
+                            assignment?.subtype.contains('grouper-group')
                         </code>
                     </script>
                 </condition>
diff --git a/demo/complex2/midpoint-objects/resources/resource-grouper.xml b/demo/complex2/midpoint-objects/resources/resource-grouper.xml
index 3fa6d0e..702f6dc 100644
--- a/demo/complex2/midpoint-objects/resources/resource-grouper.xml
+++ b/demo/complex2/midpoint-objects/resources/resource-grouper.xml
@@ -127,38 +127,8 @@
 				<ref>icfs:name</ref>
 				<inbound>
 			        <strength>strong</strength>
-					<expression>
-						<script>
-							<code>
-								switch (input) {
-									case ~/ref:affiliation:.*/: return 'affiliation_' + input.substring(16)
-									case ~/ref:dept:.*/: return 'department_' + input.substring(9)
-									case ~/ref:course:.*/: return 'course_' + input.substring(11)
-									case ~/app:mailinglist:.*/: return 'mailinglist_' + input.substring(16)
-									default: return 'generic_' + input
-								}
-							</code>
-						</script>
-					</expression>
 					<target>
-						<path>name</path>
-					</target>
-				</inbound>
-				<inbound>
-			        <strength>strong</strength>
-					<expression>
-						<script>
-							<code>
-								switch (input) {
-									case ~/ref:affiliation:.*/: return 'affiliation'
-									case ~/app:mailinglist:.*/: return 'mailing-list'
-									default: return 'generic-group'
-								}
-							</code>
-						</script>
-					</expression>
-					<target>
-						<path>subtype</path>
+						<path>extension/grouperName</path>
 					</target>
 				</inbound>
                 <inbound>
@@ -166,16 +136,18 @@
                     <expression>
                         <script>
                             <code>
-                                if (input ==~ /ref:affiliation:.*/) {
-                                    input.substring(16)
-                                } else {
-                                    input
+                                switch (input) {
+                                    case ~/ref:affiliation:.*/: return 'affiliation'
+                                    case ~/ref:dept:.*/: return 'department'
+                                    case ~/ref:course:.*/: return 'course'
+                                    case ~/app:mailinglist:.*/: return 'mailing-list'
+                                    default: return 'generic-group'
                                 }
                             </code>
                         </script>
                     </expression>
                     <target>
-                        <path>identifier</path>
+                        <path>subtype</path>
                     </target>
                 </inbound>
 			</attribute>
@@ -229,19 +201,12 @@
 			<focusType>OrgType</focusType>
 			<correlation>
 				<q:equal>
-					<q:path>name</q:path>
-					<expression>
-						<script>
-							<code>
-								def name = basic.getAttributeValue(shadow, 'http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3', 'name')
-                                                                switch (name) {
-                                                                        case ~/ref:affiliation:.*/: return 'affiliation_' + name.substring(16)
-                                                                        case ~/app:mailinglist:.*/: return 'mailinglist_' + name.substring(16)
-                                                                        default: return 'generic_' + name
-                                                                }
-							</code>
-						</script>
-					</expression>
+					<q:path>extension/grouperName</q:path>
+                    <expression>
+                        <path>
+                            $account/attributes/name
+                        </path>
+                    </expression>
 				</q:equal>
 			</correlation>
 			<reaction>
diff --git a/demo/complex2/midpoint-objects/roles/metarole-course.xml b/demo/complex2/midpoint-objects/roles/metarole-course.xml
index 48614b9..b1acba8 100644
--- a/demo/complex2/midpoint-objects/roles/metarole-course.xml
+++ b/demo/complex2/midpoint-objects/roles/metarole-course.xml
@@ -10,13 +10,16 @@
       oid="8aa99e7b-f7d3-4585-9800-14bab4d26a43">
     <name>metarole-course</name>
     <inducement id="1">
+        <targetRef oid="225e9360-0639-40ba-8a31-7f31bef067be" type="c:OrgType"/>            <!-- courses -->
+    </inducement>
+    <inducement id="2">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <kind>entitlement</kind>
             <intent>course-group</intent>
         </construction>
     </inducement>
-    <inducement id="2">
+    <inducement id="3">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <association>
@@ -35,7 +38,7 @@
         </construction>
         <order>2</order>
     </inducement>
-    <inducement id="3">
+    <inducement id="4">
         <construction>
             <strength>weak</strength>
             <resourceRef oid="a343fc2e-3954-4034-ba1a-2b72c21e577a" relation="org:default" type="c:ResourceType" />     <!-- CS CSV -->
diff --git a/demo/complex2/midpoint-objects/roles/metarole-department.xml b/demo/complex2/midpoint-objects/roles/metarole-department.xml
index 96947e3..4b8ed2b 100644
--- a/demo/complex2/midpoint-objects/roles/metarole-department.xml
+++ b/demo/complex2/midpoint-objects/roles/metarole-department.xml
@@ -10,6 +10,9 @@
       oid="ffa9eaec-9539-4d15-97aa-24cd5b92ca5b">
     <name>metarole-department</name>
     <inducement id="1">
+        <targetRef oid="bee44c51-2469-411d-bac7-695728e9c241" type="c:OrgType"/>            <!-- departments -->
+    </inducement>
+    <inducement id="2">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP for Grouper (i-data) -->
             <attribute>
diff --git a/demo/complex2/midpoint-objects/roles/metarole-grouper-group.xml b/demo/complex2/midpoint-objects/roles/metarole-grouper-group.xml
index 383d3cf..34df300 100644
--- a/demo/complex2/midpoint-objects/roles/metarole-grouper-group.xml
+++ b/demo/complex2/midpoint-objects/roles/metarole-grouper-group.xml
@@ -10,6 +10,9 @@
       oid="48e231be-8474-4ed0-a85e-6acf4c5e8d52">
     <name>metarole-grouper-group</name>
     <inducement id="1">
+        <targetRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType" />     <!-- groups -->
+    </inducement>
+    <inducement id="2">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <kind>entitlement</kind>
@@ -17,7 +20,7 @@
         </construction>
         <order>1</order>
     </inducement>
-    <inducement id="2">
+    <inducement id="3">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <association>
@@ -36,9 +39,6 @@
         </construction>
         <order>2</order>
     </inducement>
-    <inducement id="3">
-        <targetRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType" />     <!-- groups -->
-    </inducement>
     <inducement id="4">
         <construction>
             <resourceRef oid="a343fc2e-3954-4034-ba1a-2b72c21e577a" relation="org:default" type="c:ResourceType" />     <!-- CS CSV -->
diff --git a/demo/complex2/midpoint-objects/roles/metarole-mailing-list.xml b/demo/complex2/midpoint-objects/roles/metarole-mailing-list.xml
index ee87306..e5a680c 100644
--- a/demo/complex2/midpoint-objects/roles/metarole-mailing-list.xml
+++ b/demo/complex2/midpoint-objects/roles/metarole-mailing-list.xml
@@ -10,6 +10,9 @@
       oid="1c7beff4-cdf6-4e9f-b54c-79d0766f6fbe">
     <name>metarole-mailing-list</name>
     <inducement id="1">
+        <targetRef oid="d81fb46c-20c7-44d3-8402-fef404ea1264" relation="org:default" type="c:OrgType" />     <!-- mailing-lists -->
+    </inducement>
+    <inducement id="2">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <kind>entitlement</kind>
@@ -17,7 +20,7 @@
         </construction>
         <order>1</order>
     </inducement>
-    <inducement id="2">
+    <inducement id="3">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <association>
@@ -36,9 +39,6 @@
         </construction>
         <order>2</order>
     </inducement>
-    <inducement id="3">
-        <targetRef oid="d81fb46c-20c7-44d3-8402-fef404ea1264" relation="org:default" type="c:OrgType" />     <!-- mailing-lists -->
-    </inducement>
     <inducement id="4">
         <construction>
             <resourceRef oid="fe805d13-481b-43ec-97d8-9d2df72cd38e" relation="org:default" type="c:ResourceType" />     <!-- Mailing lists CSV -->
@@ -48,7 +48,7 @@
                     <strength>strong</strength>
                     <expression>
                         <script>
-                            <code>assignmentPath[0].target.identifier?.substring(16)</code>
+                            <code>assignmentPath[0].target.identifier</code>
                         </script>
                     </expression>
                 </outbound>