diff --git a/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar b/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar
index f466dc7..dfdf852 100644
Binary files a/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar and b/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar differ
diff --git a/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.7.jar b/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.7.jar
deleted file mode 100644
index d03a75b..0000000
Binary files a/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.7.jar and /dev/null differ
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml
index 7307e18..dc71278 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml
@@ -58,7 +58,6 @@
             <icfc:enableFilteredResultsHandler>false</icfc:enableFilteredResultsHandler>
             <icfc:enableAttributesToGetSearchResultsHandler>false</icfc:enableAttributesToGetSearchResultsHandler>
 	</icfc:resultsHandlerConfiguration>
-        <icfc:legacySchema>true</icfc:legacySchema>
     </connectorConfiguration>
 
     <schemaHandling>
@@ -67,7 +66,7 @@
             <intent>default</intent>
             <displayName>Default Account</displayName>
             <default>true</default>
-            <objectClass>ri:CustomSubjectObjectClass</objectClass>
+            <objectClass>ri:subject</objectClass>
 
             <focus>
                 <type>c:UserType</type>
@@ -95,9 +94,10 @@
                 <ref>ri:member_of</ref>
                 <fetchStrategy>explicit</fetchStrategy>
             </attribute>
-            <association>
+	    <association>
                 <ref>ri:group</ref>
-                <inbound>
+		<inbound>
+		    <strength>strong</strength>
                     <expression>
                         <assignmentTargetSearch>
                             <targetType>c:OrgType</targetType>
@@ -128,10 +128,29 @@
                                     </expression>
                                 </q:equal>
                             </filter>
+                            <populate>
+                                <populateItem>
+                                    <expression>
+                                        <value>grouper-group</value>
+                                    </expression>
+                                    <target>
+                                        <path>subtype</path>
+                                    </target>
+                                </populateItem>
+                            </populate>
                         </assignmentTargetSearch>
                     </expression>
                     <target>
                         <path>assignment</path>
+                        <set>
+                            <condition>
+                                <script>
+                                    <code>
+                                        assignment?.subtype?.contains('grouper-group')
+                                    </code>
+                                </script>
+                            </condition>
+                        </set>
                     </target>
                 </inbound>
                 <kind>entitlement</kind>
@@ -187,7 +206,7 @@
             <intent>group</intent>
             <displayName>Group</displayName>
             <default>true</default>
-            <objectClass>ri:GroupObjectClass</objectClass>
+            <objectClass>ri:group</objectClass>
 
             <focus>
                 <type>c:OrgType</type>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/560-task-grouper-livesync.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/560-task-grouper-livesync.xml
index 5ae4559..2c8a99a 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/560-task-grouper-livesync.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/560-task-grouper-livesync.xml
@@ -6,7 +6,8 @@
     <name>Grouper Livesync</name>
     <description>Grouper live synchronization task for groups and users. It will poll changelog and pull in changes</description>
     <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
-    <executionStatus>runnable</executionStatus>
+    <executionState>running</executionState>
+    <schedulingState>ready</schedulingState>
     <category>Recomputation</category>
     <indestructible>true</indestructible>
     <binding>tight</binding>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/610-task-reconcile-grouper-groups.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/610-task-reconcile-grouper-groups.xml
index 6f3c1e6..46172a9 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/610-task-reconcile-grouper-groups.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/610-task-reconcile-grouper-groups.xml
@@ -42,7 +42,7 @@
                     </resourceRef>
                     <kind>entitlement</kind>
                     <intent>group</intent>
-                    <objectclass>ri:GroupObjectClass</objectclass>
+                    <objectclass>ri:group</objectclass>
                 </resourceObjects>
             </reconciliation>
         </work>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/630-task-reconcile-grouper-users.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/630-task-reconcile-grouper-users.xml
index 75e65d9..72fcd58 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/630-task-reconcile-grouper-users.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/630-task-reconcile-grouper-users.xml
@@ -55,7 +55,7 @@
                     </resourceRef>
                     <kind>account</kind>
                     <intent>default</intent>
-                    <objectclass>ri:CustomSubjectObjectClass</objectclass>
+                    <objectclass>ri:subject</objectclass>
                 </resourceObjects>
             </reconciliation>
         </work>