diff --git a/demo/complex/midpoint-objects/objectTemplates/template-org-group.xml b/demo/complex/midpoint-objects/objectTemplates/template-org-group.xml
new file mode 100644
index 0000000..0cd047f
--- /dev/null
+++ b/demo/complex/midpoint-objects/objectTemplates/template-org-group.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<objectTemplate xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+    oid="e2a6193a-8981-4143-9da1-9a7b32c0b819">
+    <name>template-org-group</name>
+    <mapping>
+        <strength>strong</strength>
+        <expression>
+            <assignmentTargetSearch>
+                <targetType>RoleType</targetType>
+                <oid>48e231be-8474-4ed0-a85e-6acf4c5e8d52</oid>     <!--  metarole-group -->
+            </assignmentTargetSearch>
+        </expression>
+        <target>
+            <path>assignment</path>
+        </target>
+    </mapping>
+    
+</objectTemplate>
diff --git a/demo/complex/midpoint-objects/objectTemplates/template-user.xml b/demo/complex/midpoint-objects/objectTemplates/template-user.xml
new file mode 100644
index 0000000..455ccc0
--- /dev/null
+++ b/demo/complex/midpoint-objects/objectTemplates/template-user.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<objectTemplate xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" oid="8098b124-c20c-4965-8adf-e528abedf7a4">
+    <name>User Template</name>
+    <mapping>
+        <strength>strong</strength>
+        <source>
+            <path>extension/grouper_group</path>
+        </source>
+        <expression>
+            <assignmentTargetSearch>
+                <targetType>OrgType</targetType>
+                <filter>
+                    <q:equal>
+                        <q:path>name</q:path>                       
+                        <expression>
+                            <script>
+                                <code>
+                                    grouper_group
+                                </code>
+                            </script>
+                        </expression>
+                    </q:equal>
+                </filter>
+                <assignmentProperties>
+                    <subtype>group</subtype>
+                </assignmentProperties>
+                <createOnDemand>true</createOnDemand>
+                <populateObject>
+                    <populateItem>
+                        <target>
+                            <path>name</path>
+                        </target>
+                        <expression>
+                            <script>
+                                <code>
+                                    grouper_group
+                                </code>
+                            </script>
+                        </expression>
+                    </populateItem>
+                    <populateItem>
+                        <target>
+                            <path>subtype</path>
+                        </target>
+                        <expression>
+                            <value>group</value>
+                        </expression>
+                    </populateItem>
+                </populateObject>
+            </assignmentTargetSearch>       
+        </expression>
+        <target>
+            <path>assignment</path>
+            <set>
+                <condition>
+                    <script>
+                        <code>
+                            assignment?.subtype.contains('group')
+                        </code>
+                    </script>
+                </condition>
+            </set>
+        </target>
+    </mapping>
+</objectTemplate>
diff --git a/demo/complex/midpoint-objects/orgs/org-groups.xml b/demo/complex/midpoint-objects/orgs/org-groups.xml
new file mode 100644
index 0000000..4998a2f
--- /dev/null
+++ b/demo/complex/midpoint-objects/orgs/org-groups.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<org xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+    oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d">
+    <name>groups</name>
+    <displayName>Groups</displayName>
+</org>
diff --git a/demo/complex/midpoint-objects/resources/resource-grouper.xml b/demo/complex/midpoint-objects/resources/resource-grouper.xml
index d743319..4745877 100644
--- a/demo/complex/midpoint-objects/resources/resource-grouper.xml
+++ b/demo/complex/midpoint-objects/resources/resource-grouper.xml
@@ -119,10 +119,20 @@
 			<attribute>
 				<ref>icfs:name</ref>
 				<inbound>
+			                <strength>strong</strength>
 					<target>
 						<path>name</path>
 					</target>
 				</inbound>
+				<inbound>
+			                <strength>strong</strength>
+					<expression>
+						<value>group</value>
+					</expression>
+					<target>
+						<path>subtype</path>
+					</target>
+				</inbound>
 			</attribute>
 		</objectType>
 	</schemaHandling>
diff --git a/demo/complex/midpoint-objects/roles/metarole-group.xml b/demo/complex/midpoint-objects/roles/metarole-group.xml
new file mode 100644
index 0000000..bdf7113
--- /dev/null
+++ b/demo/complex/midpoint-objects/roles/metarole-group.xml
@@ -0,0 +1,16 @@
+<role xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" 
+      xmlns:apti="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3" 
+      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" 
+      xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" 
+      xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" 
+      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
+      xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" 
+      xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" 
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+      oid="48e231be-8474-4ed0-a85e-6acf4c5e8d52">
+    <name>metarole-group</name>
+    <inducement id="1">
+        <targetRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType" />     <!-- groups -->
+    </inducement>
+
+</role>
diff --git a/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml b/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml
index 146ee38..3c162e1 100644
--- a/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml
+++ b/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml
@@ -105,11 +105,20 @@
          <subtype>course</subtype>
          <objectTemplateRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="d35bdec6-643b-41d8-ad5d-8eeb701169d1" relation="org:default" type="tns:ObjectTemplateType"/>
       </defaultObjectPolicyConfiguration>
+      <defaultObjectPolicyConfiguration id="100">
+         <type>OrgType</type>
+         <subtype>group</subtype>
+         <objectTemplateRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="e2a6193a-8981-4143-9da1-9a7b32c0b819" relation="org:default" type="tns:ObjectTemplateType"/>
+      </defaultObjectPolicyConfiguration>
       <defaultObjectPolicyConfiguration id="21">
          <type>RoleType</type>
          <subtype>generic-group</subtype>
          <objectTemplateRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="804f8658-0828-4dab-a2ed-f13985e4f80b" relation="org:default" type="tns:ObjectTemplateType"/>
       </defaultObjectPolicyConfiguration>
+      <defaultObjectPolicyConfiguration id="101">
+         <type>UserType</type>
+         <objectTemplateRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="8098b124-c20c-4965-8adf-e528abedf7a4" relation="org:default" type="tns:ObjectTemplateType"/>
+      </defaultObjectPolicyConfiguration>
       <cleanupPolicy>
          <auditRecords>
             <maxAge>P3M</maxAge>