diff --git a/Jenkinsfile b/Jenkinsfile
index 1c6990e..2fa1642 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,7 +60,7 @@ pipeline {
 
                         sh '(cd demo/simple ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                         // sh '(cd demo/shibboleth ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
-                        sh '(cd demo/postgresql ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
+                        // sh '(cd demo/postgresql ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                         sh '(cd demo/complex ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                     } catch (error) {
                         def error_details = readFile('./debug')
diff --git a/demo/complex/directory/container_files/seed-data/users.ldif b/demo/complex/directory/container_files/seed-data/users.ldif
index 5381f7d..09c34da 100644
--- a/demo/complex/directory/container_files/seed-data/users.ldif
+++ b/demo/complex/directory/container_files/seed-data/users.ldif
@@ -17,4 +17,14 @@ objectClass: top
 objectClass: organizationalUnit
 ou: Courses
 
+dn: ou=midpoint,ou=Groups,dc=internet2,dc=edu
+objectClass: top
+objectClass: organizationalUnit
+ou: midpoint
+
+dn: ou=Generic,ou=Groups,dc=internet2,dc=edu
+objectClass: top
+objectClass: organizationalUnit
+ou: Generic
+
 
diff --git a/demo/complex/grouper_data/container_files/seed-data/demo.gsh b/demo/complex/grouper_data/container_files/seed-data/demo.gsh
index e584add..0d13760 100644
--- a/demo/complex/grouper_data/container_files/seed-data/demo.gsh
+++ b/demo/complex/grouper_data/container_files/seed-data/demo.gsh
@@ -65,7 +65,7 @@ attributeAssign = group.getAttributeDelegate().retrieveAssignment(null, LoaderLd
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapQuartzCronName(), "0 * * * * ?");
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapTypeName(), "LDAP_SIMPLE");
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapFilterName(), "(cn=sysadmingroup)");
-attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSearchDnName(), "ou=Groups");
+attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSearchDnName(), "ou=midpoint,ou=Groups");
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapServerIdName(), "demo");
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSourceIdName(), "ldap");
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSubjectExpressionName(), '${loaderLdapElUtils.convertDnToSpecificValue(subjectId)}');
diff --git a/demo/complex/midpoint-objects/objectTemplates/template-role-affiliation.xml b/demo/complex/midpoint-objects/objectTemplates/template-org-affiliation.xml
similarity index 90%
rename from demo/complex/midpoint-objects/objectTemplates/template-role-affiliation.xml
rename to demo/complex/midpoint-objects/objectTemplates/template-org-affiliation.xml
index 3a9c726..00abb98 100644
--- a/demo/complex/midpoint-objects/objectTemplates/template-role-affiliation.xml
+++ b/demo/complex/midpoint-objects/objectTemplates/template-org-affiliation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <objectTemplate xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
     oid="d87aa04f-189c-4d6f-b6e1-216dad622142">
-    <name>template-role-affiliation</name>
+    <name>template-org-affiliation</name>
     <mapping>
         <strength>strong</strength>
         <expression>
@@ -14,4 +14,4 @@
             <path>assignment</path>
         </target>
     </mapping>
-</objectTemplate>
\ No newline at end of file
+</objectTemplate>
diff --git a/demo/complex/midpoint-objects/objectTemplates/template-org-group.xml b/demo/complex/midpoint-objects/objectTemplates/template-org-generic-group.xml
similarity index 87%
rename from demo/complex/midpoint-objects/objectTemplates/template-org-group.xml
rename to demo/complex/midpoint-objects/objectTemplates/template-org-generic-group.xml
index 0cd047f..6e9b462 100644
--- a/demo/complex/midpoint-objects/objectTemplates/template-org-group.xml
+++ b/demo/complex/midpoint-objects/objectTemplates/template-org-generic-group.xml
@@ -1,13 +1,13 @@
 <?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>
+    <name>template-org-generic-group</name>
     <mapping>
         <strength>strong</strength>
         <expression>
             <assignmentTargetSearch>
                 <targetType>RoleType</targetType>
-                <oid>48e231be-8474-4ed0-a85e-6acf4c5e8d52</oid>     <!--  metarole-group -->
+                <oid>48e231be-8474-4ed0-a85e-6acf4c5e8d52</oid>     <!--  metarole-generic-group -->
             </assignmentTargetSearch>
         </expression>
         <target>
diff --git a/demo/complex/midpoint-objects/objectTemplates/template-role-generic-group.xml b/demo/complex/midpoint-objects/objectTemplates/template-role-midpoint-group.xml
similarity index 83%
rename from demo/complex/midpoint-objects/objectTemplates/template-role-generic-group.xml
rename to demo/complex/midpoint-objects/objectTemplates/template-role-midpoint-group.xml
index 1205f6d..62296e9 100644
--- a/demo/complex/midpoint-objects/objectTemplates/template-role-generic-group.xml
+++ b/demo/complex/midpoint-objects/objectTemplates/template-role-midpoint-group.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <objectTemplate xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
     oid="804f8658-0828-4dab-a2ed-f13985e4f80b">
-    <name>template-role-generic-group</name>
+    <name>template-role-midpoint-group</name>
     <mapping>
         <strength>strong</strength>
         <expression>
             <assignmentTargetSearch>
                 <targetType>RoleType</targetType>
-                <oid>c691e15a-f30b-4e15-8445-532db07ceeeb</oid>     <!--  metarole-generic-group -->
+                <oid>c691e15a-f30b-4e15-8445-532db07ceeeb</oid>     <!--  metarole-midpoint-group -->
             </assignmentTargetSearch>
         </expression>
         <target>
             <path>assignment</path>
         </target>
     </mapping>
-</objectTemplate>
\ No newline at end of file
+</objectTemplate>
diff --git a/demo/complex/midpoint-objects/objectTemplates/template-user.xml b/demo/complex/midpoint-objects/objectTemplates/template-user.xml
index 455ccc0..288bd24 100644
--- a/demo/complex/midpoint-objects/objectTemplates/template-user.xml
+++ b/demo/complex/midpoint-objects/objectTemplates/template-user.xml
@@ -4,7 +4,7 @@
     <mapping>
         <strength>strong</strength>
         <source>
-            <path>extension/grouper_group</path>
+            <path>extension/grouperGroup</path>
         </source>
         <expression>
             <assignmentTargetSearch>
@@ -15,14 +15,14 @@
                         <expression>
                             <script>
                                 <code>
-                                    grouper_group
+                                    grouperGroup
                                 </code>
                             </script>
                         </expression>
                     </q:equal>
                 </filter>
                 <assignmentProperties>
-                    <subtype>group</subtype>
+                    <subtype>generic-group</subtype>
                 </assignmentProperties>
                 <createOnDemand>true</createOnDemand>
                 <populateObject>
@@ -33,7 +33,7 @@
                         <expression>
                             <script>
                                 <code>
-                                    grouper_group
+                                    grouperGroup
                                 </code>
                             </script>
                         </expression>
@@ -43,7 +43,7 @@
                             <path>subtype</path>
                         </target>
                         <expression>
-                            <value>group</value>
+                            <value>generic-group</value>
                         </expression>
                     </populateItem>
                 </populateObject>
@@ -55,7 +55,7 @@
                 <condition>
                     <script>
                         <code>
-                            assignment?.subtype.contains('group')
+                            assignment?.subtype.contains('generic-group')
                         </code>
                     </script>
                 </condition>
diff --git a/demo/complex/midpoint-objects/orgs/org-affiliations.xml b/demo/complex/midpoint-objects/orgs/org-affiliations.xml
new file mode 100644
index 0000000..618f9ee
--- /dev/null
+++ b/demo/complex/midpoint-objects/orgs/org-affiliations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<org xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+    oid="1d7c0e3a-4456-409c-9f50-95407b2eb785">
+    <name>affiliations</name>
+    <displayName>Affiliations</displayName>
+</org>
diff --git a/demo/complex/midpoint-objects/orgs/org-groups.xml b/demo/complex/midpoint-objects/orgs/org-generic-groups.xml
similarity index 65%
rename from demo/complex/midpoint-objects/orgs/org-groups.xml
rename to demo/complex/midpoint-objects/orgs/org-generic-groups.xml
index 4998a2f..fa39bbc 100644
--- a/demo/complex/midpoint-objects/orgs/org-groups.xml
+++ b/demo/complex/midpoint-objects/orgs/org-generic-groups.xml
@@ -1,6 +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>
+    <name>generic-groups</name>
+    <displayName>Generic groups</displayName>
 </org>
diff --git a/demo/complex/midpoint-objects/orgs/org-mailing-lists.xml b/demo/complex/midpoint-objects/orgs/org-mailing-lists.xml
new file mode 100644
index 0000000..136c3ee
--- /dev/null
+++ b/demo/complex/midpoint-objects/orgs/org-mailing-lists.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<org xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+    oid="d81fb46c-20c7-44d3-8402-fef404ea1264">
+    <name>mailing-lists</name>
+    <displayName>Mailing lists</displayName>
+</org>
diff --git a/demo/complex/midpoint-objects/resources/ldap-main.xml b/demo/complex/midpoint-objects/resources/ldap-main.xml
index f826cc7..8277067 100644
--- a/demo/complex/midpoint-objects/resources/ldap-main.xml
+++ b/demo/complex/midpoint-objects/resources/ldap-main.xml
@@ -180,22 +180,20 @@
 				</attribute>
 				<attribute>
 					<ref>ri:eduPersonAffiliation</ref>
+					<outbound>
+						<strength>strong</strength>
+						<source>
+							<path>extension/rawAffiliation</path>
+						</source>
+					</outbound>
                     <tolerant>false</tolerant>
 				</attribute>
-                <attribute>
-                    <ref>ri:eduPersonEntitlement</ref>
-                    <tolerant>false</tolerant>
-                    <outbound>
-                        <source>
-                            <path>extension/grouper_group</path>
-                        </source>
-                    </outbound>
-                </attribute>
                 <association>
                     <tolerant>false</tolerant>
                     <ref>ri:group</ref>
                     <kind>entitlement</kind>
                     <intent>course-group</intent>
+                    <intent>midpoint-group</intent>
                     <intent>generic-group</intent>
                     <direction>objectToSubject</direction>
                     <associationAttribute>ri:uniqueMember</associationAttribute>
@@ -259,6 +257,45 @@
                     </outbound>
                 </attribute>
             </objectType>
+            <objectType>
+                <kind>entitlement</kind>
+                <intent>midpoint-group</intent>
+                <displayName>LDAP Group</displayName>
+                <objectClass>ri:groupOfUniqueNames</objectClass>
+                <attribute>
+                    <ref>ri:uniqueMember</ref>
+                    <matchingRule>mr:distinguishedName</matchingRule>
+                    <fetchStrategy>minimal</fetchStrategy>
+                </attribute>
+                <attribute>
+                    <ref>ri:dn</ref>
+                    <matchingRule>mr:stringIgnoreCase</matchingRule>
+                    <outbound>
+                        <strength>strong</strength>
+                        <trace>true</trace>
+                        <source>
+                            <path>identifier</path>
+                        </source>
+                        <expression>
+                            <script>
+                                <code>
+                                    basic.composeDnWithSuffix('cn', identifier, 'ou=midpoint,ou=Groups,dc=internet2,dc=edu')
+                                </code>
+                            </script>
+                        </expression>
+                    </outbound>
+                </attribute>
+                <attribute>
+                    <ref>ri:cn</ref>
+                    <matchingRule>mr:stringIgnoreCase</matchingRule>
+                    <outbound>
+                        <strength>weak</strength>
+                        <source>
+                            <path>identifier</path>
+                        </source>
+                    </outbound>
+                </attribute>
+            </objectType>
             <objectType>
                 <kind>entitlement</kind>
                 <intent>generic-group</intent>
@@ -281,7 +318,7 @@
                         <expression>
                             <script>
                                 <code>
-                                    basic.composeDnWithSuffix('cn', identifier, 'ou=Groups,dc=internet2,dc=edu')
+                                    basic.composeDnWithSuffix('cn', identifier, 'ou=generic,ou=Groups,dc=internet2,dc=edu')
                                 </code>
                             </script>
                         </expression>
@@ -393,20 +430,73 @@
                     <situation>unmatched</situation>
                 </reaction>
             </objectSynchronization>
+            <objectSynchronization>
+                <name>midpoint-group sync</name>
+                <objectClass>ri:groupOfUniqueNames</objectClass>
+                <kind>entitlement</kind>
+                <intent>midpoint-group</intent>
+                <focusType>RoleType</focusType>
+                <enabled>true</enabled>
+                <condition>
+                    <script>
+                        <code>
+                            import javax.naming.ldap.*
+                            dn = new LdapName(basic.getAttributeValue(account, 'http://midpoint.evolveum.com/xml/ns/public/resource/instance-3', 'dn'))
+                            log.info('midpoint-group sync: considering {}; dn.size={}, dn.startsWith={}', dn, dn.size(), dn.startsWith(new LdapName('ou=midpoint,ou=Groups,dc=internet2,dc=edu')))
+                            dn.size() == 5 &amp;&amp; dn.startsWith(new LdapName('ou=midpoint,ou=Groups,dc=internet2,dc=edu'))
+                        </code>
+                    </script>
+                </condition>
+                <correlation>
+                    <q:and>
+                        <q:equal>
+                            <q:path>identifier</q:path>
+                            <expression>
+                                <path>$shadow/attributes/ri:cn</path>
+                            </expression>
+                        </q:equal>
+                        <q:equal>
+                            <q:path>subtype</q:path>
+                            <q:value>midpoint-group</q:value>
+                        </q:equal>
+                    </q:and>
+                </correlation>
+                <reaction>
+                    <situation>linked</situation>
+                    <synchronize>true</synchronize>
+                </reaction>
+                <reaction>
+                    <situation>deleted</situation>
+                    <synchronize>true</synchronize>
+                    <action>
+                        <handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink</handlerUri>
+                    </action>
+                </reaction>
+                <reaction>
+                    <situation>unlinked</situation>
+                    <synchronize>true</synchronize>
+                    <action>
+                        <handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#link</handlerUri>
+                    </action>
+                </reaction>
+                <reaction>
+                    <situation>unmatched</situation>
+                </reaction>
+            </objectSynchronization>
             <objectSynchronization>
                 <name>generic-group sync</name>
                 <objectClass>ri:groupOfUniqueNames</objectClass>
                 <kind>entitlement</kind>
                 <intent>generic-group</intent>
-                <focusType>RoleType</focusType>
+                <focusType>OrgType</focusType>
                 <enabled>true</enabled>
                 <condition>
                     <script>
                         <code>
                             import javax.naming.ldap.*
                             dn = new LdapName(basic.getAttributeValue(account, 'http://midpoint.evolveum.com/xml/ns/public/resource/instance-3', 'dn'))
-                            log.info('generic-group sync: considering {}; dn.size={}, dn.startsWith={}', dn, dn.size(), dn.startsWith(new LdapName('ou=Groups,dc=internet2,dc=edu')))
-                            dn.size() == 4 &amp;&amp; dn.startsWith(new LdapName('ou=Groups,dc=internet2,dc=edu'))
+                            log.info('generic-group sync: considering {}; dn.size={}, dn.startsWith={}', dn, dn.size(), dn.startsWith(new LdapName('ou=Generic,ou=Groups,dc=internet2,dc=edu')))
+                            dn.size() == 5 &amp;&amp; dn.startsWith(new LdapName('ou=Generic,ou=Groups,dc=internet2,dc=edu'))
                         </code>
                     </script>
                 </condition>
diff --git a/demo/complex/midpoint-objects/resources/resource-grouper.xml b/demo/complex/midpoint-objects/resources/resource-grouper.xml
index ca43a21..186e929 100644
--- a/demo/complex/midpoint-objects/resources/resource-grouper.xml
+++ b/demo/complex/midpoint-objects/resources/resource-grouper.xml
@@ -110,7 +110,7 @@
 				<inbound>
 			                <strength>strong</strength>
 					<target>
-						<path>extension/grouper_group</path>
+						<path>extension/grouperGroup</path>
 					</target>
 				</inbound>
 			</attribute>
@@ -131,7 +131,7 @@
 				<inbound>
 			                <strength>strong</strength>
 					<expression>
-						<value>group</value>
+						<value>generic-group</value>
 					</expression>
 					<target>
 						<path>subtype</path>
diff --git a/demo/complex/midpoint-objects/resources/scriptedsql-sis-courses.xml b/demo/complex/midpoint-objects/resources/scriptedsql-sis-courses.xml
index 6b5f84b..7351c7a 100644
--- a/demo/complex/midpoint-objects/resources/scriptedsql-sis-courses.xml
+++ b/demo/complex/midpoint-objects/resources/scriptedsql-sis-courses.xml
@@ -29,9 +29,9 @@
 			<!-- >icscscriptedsql:clearTextPasswordToScript>true</icscscriptedsql:clearTextPasswordToScript -->
 			<icscscriptedsql:scriptingLanguage>GROOVY</icscscriptedsql:scriptingLanguage>
 
-			<icscscriptedsql:searchScriptFileName>/opt/midpoint/var/res/sis/SearchScript.groovy</icscscriptedsql:searchScriptFileName>
-			<icscscriptedsql:testScriptFileName>/opt/midpoint/var/res/sis/TestScript.groovy</icscscriptedsql:testScriptFileName>
-			<icscscriptedsql:schemaScriptFileName>/opt/midpoint/var/res/sis/SchemaScript.groovy</icscscriptedsql:schemaScriptFileName>
+			<icscscriptedsql:searchScriptFileName>/opt/midpoint/var/res/sis-courses/SearchScript.groovy</icscscriptedsql:searchScriptFileName>
+			<icscscriptedsql:testScriptFileName>/opt/midpoint/var/res/sis-courses/TestScript.groovy</icscscriptedsql:testScriptFileName>
+			<icscscriptedsql:schemaScriptFileName>/opt/midpoint/var/res/sis-courses/SchemaScript.groovy</icscscriptedsql:schemaScriptFileName>
 			
 			<icscscriptedsql:reloadScriptOnExecution>true</icscscriptedsql:reloadScriptOnExecution>
 			<!-- >icscscriptedsql:syncScriptFileName>/opt/midpoint/var/res/SyncScript.groovy</icscscriptedsql:syncScriptFileName -->
diff --git a/demo/complex/midpoint-objects/resources/scriptedsql-sis-persons.xml b/demo/complex/midpoint-objects/resources/scriptedsql-sis-persons.xml
index 568074d..673f6d2 100644
--- a/demo/complex/midpoint-objects/resources/scriptedsql-sis-persons.xml
+++ b/demo/complex/midpoint-objects/resources/scriptedsql-sis-persons.xml
@@ -246,85 +246,9 @@
                 <ref>ri:affiliation</ref>
                 <inbound>
                     <strength>strong</strength>
-                    <expression>
-                        <assignmentTargetSearch>
-                            <targetType>RoleType</targetType>
-                            <filter>
-                                <q:equal>
-                                    <q:path>name</q:path>                       
-                                    <expression>
-                                        <script>
-                                            <code>
-                                                'affiliation_' + input
-                                            </code>
-                                        </script>
-                                    </expression>                       
-                                </q:equal>
-                            </filter>
-                            <createOnDemand>true</createOnDemand>
-                            <populateObject>
-                                <populateItem>
-                                    <expression>
-                                        <script>
-                                            <code>
-                                                'affiliation_' + input
-                                            </code>
-                                        </script>
-                                    </expression>
-                                    <target>
-                                        <path>name</path>
-                                    </target>
-                                </populateItem>
-                                <populateItem>
-                                    <expression>
-                                        <script>
-                                            <code>
-                                                'Affiliation: ' + input
-                                            </code>
-                                        </script>
-                                    </expression>
-                                    <target>
-                                        <path>displayName</path>
-                                    </target>
-                                </populateItem>
-                                <populateItem>
-                                    <expression>
-                                        <script>
-                                            <code>
-                                                input
-                                            </code>
-                                        </script>
-                                    </expression>
-                                    <target>
-                                        <path>identifier</path>
-                                    </target>
-                                </populateItem>
-                                <populateItem>
-                                    <expression>
-                                        <value>affiliation</value>
-                                    </expression>
-                                    <target>
-                                        <path>subtype</path>
-                                    </target>
-                                </populateItem>
-                            </populateObject>
-                            <assignmentProperties>
-                                <subtype>affiliation</subtype>
-                            </assignmentProperties>
-                        </assignmentTargetSearch>       
-                    </expression>
                     <target>
-                        <path>assignment</path>
-                        <set>
-                            <condition>
-                                <script>
-                                    <code>
-                                        assignment.subtype.contains('affiliation')
-                                    </code>
-                                </script>
-                            </condition>
-                        </set>
-                    </target>
+			<path>extension/rawAffiliation</path>
+		    </target>
                 </inbound>
             </attribute>
 		</objectType>
diff --git a/demo/complex/midpoint-objects/roles/metarole-affiliation.xml b/demo/complex/midpoint-objects/roles/metarole-affiliation.xml
index be64d72..cdfa819 100644
--- a/demo/complex/midpoint-objects/roles/metarole-affiliation.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-affiliation.xml
@@ -9,21 +9,5 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
       oid="fecae27b-d1d3-40ae-95fa-8f7e44e2ee70">
     <name>metarole-affiliation</name>
-    <inducement id="1">
-        <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP for Grouper (i-data) -->
-            <attribute>
-                <ref>ri:eduPersonAffiliation</ref>
-                <outbound>
-                    <strength>strong</strength>
-                    <expression>
-                        <script>
-                            <code>assignmentPath[0].target.identifier</code>
-                        </script>
-                    </expression>
-                </outbound>
-            </attribute>
-        </construction>
-        <order>2</order>
-    </inducement>
+	<!-- TODO -->
 </role>
diff --git a/demo/complex/midpoint-objects/roles/metarole-group.xml b/demo/complex/midpoint-objects/roles/metarole-grouper-group.xml
similarity index 95%
rename from demo/complex/midpoint-objects/roles/metarole-group.xml
rename to demo/complex/midpoint-objects/roles/metarole-grouper-group.xml
index bdf7113..df08f51 100644
--- a/demo/complex/midpoint-objects/roles/metarole-group.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-grouper-group.xml
@@ -8,7 +8,7 @@
       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>
+    <name>metarole-grouper-group</name>
     <inducement id="1">
         <targetRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType" />     <!-- groups -->
     </inducement>
diff --git a/demo/complex/midpoint-objects/roles/metarole-generic-group.xml b/demo/complex/midpoint-objects/roles/metarole-midpoint-group.xml
similarity index 92%
rename from demo/complex/midpoint-objects/roles/metarole-generic-group.xml
rename to demo/complex/midpoint-objects/roles/metarole-midpoint-group.xml
index f0e93c5..a2a2c9a 100644
--- a/demo/complex/midpoint-objects/roles/metarole-generic-group.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-midpoint-group.xml
@@ -8,12 +8,12 @@
       xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
       oid="c691e15a-f30b-4e15-8445-532db07ceeeb">
-    <name>metarole-generic-group</name>
+    <name>metarole-midpoint-group</name>
     <inducement id="1">
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP for Grouper (i-data) -->
             <kind>entitlement</kind>
-            <intent>generic-group</intent>
+            <intent>midpoint-group</intent>
         </construction>
     </inducement>
     <inducement id="2">
@@ -26,7 +26,7 @@
                         <associationFromLink>
                             <projectionDiscriminator>
                                 <kind>entitlement</kind>
-                                <intent>generic-group</intent>
+                                <intent>midpoint-group</intent>
                             </projectionDiscriminator>
                         </associationFromLink>
                     </expression>
diff --git a/demo/complex/midpoint-objects/roles/role-grouper-sysadmin.xml b/demo/complex/midpoint-objects/roles/role-grouper-sysadmin.xml
index 5b559f8..cb81a23 100644
--- a/demo/complex/midpoint-objects/roles/role-grouper-sysadmin.xml
+++ b/demo/complex/midpoint-objects/roles/role-grouper-sysadmin.xml
@@ -10,8 +10,8 @@
       oid="d48ec05b-fffd-4262-acd3-d9ff63365b62">
     <name>role-grouper-sysadmin</name>
     <assignment id="1">
-        <targetRef oid="c691e15a-f30b-4e15-8445-532db07ceeeb" type="RoleType"/>         <!--  metarole-generic-group -->
+        <targetRef oid="c691e15a-f30b-4e15-8445-532db07ceeeb" type="RoleType"/>         <!--  metarole-midpoint-group -->
     </assignment>
-    <subtype>generic-group</subtype>
+    <subtype>midpoint-group</subtype>
     <identifier>sysadmingroup</identifier>
 </role>
diff --git a/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml b/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml
index 3c162e1..eb5f90c 100644
--- a/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml
+++ b/demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml
@@ -91,7 +91,7 @@
          </auditing>
       </logging>
       <defaultObjectPolicyConfiguration id="18">
-         <type>RoleType</type>
+         <type>OrgType</type>
          <subtype>affiliation</subtype>
          <objectTemplateRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="d87aa04f-189c-4d6f-b6e1-216dad622142" relation="org:default" type="tns:ObjectTemplateType"/>
       </defaultObjectPolicyConfiguration>
@@ -107,12 +107,12 @@
       </defaultObjectPolicyConfiguration>
       <defaultObjectPolicyConfiguration id="100">
          <type>OrgType</type>
-         <subtype>group</subtype>
+         <subtype>generic-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>
+         <subtype>midpoint-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">
diff --git a/demo/complex/midpoint_server/container_files/mp-home/res/sis/SchemaScript.groovy b/demo/complex/midpoint_server/container_files/mp-home/res/sis-courses/SchemaScript.groovy
similarity index 100%
rename from demo/complex/midpoint_server/container_files/mp-home/res/sis/SchemaScript.groovy
rename to demo/complex/midpoint_server/container_files/mp-home/res/sis-courses/SchemaScript.groovy
diff --git a/demo/complex/midpoint_server/container_files/mp-home/res/sis/SearchScript.groovy b/demo/complex/midpoint_server/container_files/mp-home/res/sis-courses/SearchScript.groovy
similarity index 100%
rename from demo/complex/midpoint_server/container_files/mp-home/res/sis/SearchScript.groovy
rename to demo/complex/midpoint_server/container_files/mp-home/res/sis-courses/SearchScript.groovy
diff --git a/demo/complex/midpoint_server/container_files/mp-home/res/sis/TestScript.groovy b/demo/complex/midpoint_server/container_files/mp-home/res/sis-courses/TestScript.groovy
similarity index 100%
rename from demo/complex/midpoint_server/container_files/mp-home/res/sis/TestScript.groovy
rename to demo/complex/midpoint_server/container_files/mp-home/res/sis-courses/TestScript.groovy
diff --git a/demo/complex/midpoint_server/container_files/mp-home/schema/user-schema.xsd b/demo/complex/midpoint_server/container_files/mp-home/schema/user-schema.xsd
index 329534a..00d479b 100644
--- a/demo/complex/midpoint_server/container_files/mp-home/schema/user-schema.xsd
+++ b/demo/complex/midpoint_server/container_files/mp-home/schema/user-schema.xsd
@@ -14,7 +14,8 @@
       </xsd:appinfo>
     </xsd:annotation>
     <xsd:sequence>
-        <xsd:element name="grouper_group" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="grouperGroup" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="rawAffiliation" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>  
 </xsd:schema>
diff --git a/demo/complex/upload-import-sis-persons.sh b/demo/complex/upload-import-sis-persons.sh
new file mode 100755
index 0000000..4e0d56d
--- /dev/null
+++ b/demo/complex/upload-import-sis-persons.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+function upload () {
+  local filename=$1
+  local regex="midpoint-objects.*/(.*)/(.*)"
+  if [[ $filename =~ $regex ]]
+  then
+    type="${BASH_REMATCH[1]}"
+    oid=`cat $filename | sed -n 's:.*oid=\"\([A-Za-z0-9\-]*\)\".*:\1:p' | sed -n '1 p'`
+    echo "Uploading $filename ($type, $oid)"
+    curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X PUT "https://localhost:8443/midpoint/ws/rest/$type/$oid?options=overwrite&options=raw" --data-binary @$filename
+  else
+    echo "Skipping $filename"
+  fi
+}
+
+upload midpoint-objects-manual/tasks/task-import-sis-persons.xml