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 74e744b..f466dc7 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/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 12ff683..7307e18 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
@@ -268,6 +268,62 @@
                 <fetchStrategy>explicit</fetchStrategy>
             </attribute>
 
+            <association>
+                <ref>ri:subjects</ref>
+                <inbound>
+                    <expression>
+                        <assignmentTargetSearch>
+                            <targetType>c:OrgType</targetType>
+                            <filter>
+                                <q:equal>
+                                    <q:path>name</q:path>
+                                    <expression>
+                                        <script>
+                                            <code>
+                                                def groupName;
+                                                if (entitlement!=null){
+                                                def attrs = entitlement.getAttributes();
+                                                pcvi = attrs.asPrismContainerValue().getItems();
+
+                                                for (obj in pcvi){
+                                                if (obj.isSingleValue()){
+
+                                                if("uid".equals(obj?.getElementName().toString())){
+
+                                                groupName = obj?.getValue()?.getRealValue()
+
+                                                //TODO remove log
+                                                log.info("The group name: " +groupName)
+
+                                                return groupName
+                                                }
+                                                }
+                                                }
+
+                                                }
+
+                                                return groupName;
+                                            </code>
+                                        </script>
+                                    </expression>
+                                </q:equal>
+                            </filter>
+                        </assignmentTargetSearch>
+                    </expression>
+                    <target>
+                        <path>assignment</path>
+                    </target>
+                </inbound>
+                <kind>account</kind>
+                <intent>default</intent>
+                <direction>subjectToObject</direction>
+                <associationAttribute>ri:members</associationAttribute>
+                <valueAttribute>icfs:uid</valueAttribute>
+                <shortcutAssociationAttribute>ri:member_of</shortcutAssociationAttribute>
+                <shortcutValueAttribute>icfs:uid</shortcutValueAttribute>
+                <explicitReferentialIntegrity>false</explicitReferentialIntegrity>
+            </association>
+
             <correlation>
                 <correlators>
                     <items>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/550-task-grouper-users-livesync.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/550-task-grouper-users-livesync.xml
deleted file mode 100644
index 007f6f1..0000000
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/550-task-grouper-users-livesync.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-      oid="1c59ebd0-39e4-4ed4-9779-4c29f56b3d6d">
-    <name>Groups: User Livesync</name>
-    <description>Grouper live synchronization task for users. It will poll changelog and pull in changes</description>
-    <taskIdentifier>1494860534232132-0-1</taskIdentifier>
-    <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
-    <executionStatus>waiting</executionStatus>
-    <waitingReason>otherTasks</waitingReason>
-    <category>Recomputation</category>
-    <indestructible>true</indestructible>
-    <objectRef oid="fb0bbf07-e33f-4ddd-85a1-16a7edc237f2" type="c:ResourceType"/>
-    <binding>tight</binding>
-    <schedule>
-        <recurrence>recurring</recurrence>
-        <interval>5</interval>
-    </schedule>
-    <activity>
-        <work>
-            <liveSynchronization>
-                <resourceObjects>
-                    <resourceRef oid="fb0bbf07-e33f-4ddd-85a1-16a7edc237f2"/>
-                    <objectclass>CustomSubjectObjectClass</objectclass>
-                </resourceObjects>
-            </liveSynchronization>
-        </work>
-    </activity>
-</task>
-
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/550-task-grouper-groups-livesync.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/560-task-grouper-livesync.xml
similarity index 61%
rename from Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/550-task-grouper-groups-livesync.xml
rename to Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/560-task-grouper-livesync.xml
index c916cf4..5ae4559 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/550-task-grouper-groups-livesync.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/560-task-grouper-livesync.xml
@@ -2,16 +2,13 @@
       xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-      oid="5a821505-7318-4364-9a2f-501b8bf30b44">
-    <name>Groups: Group Livesync</name>
-    <description>Grouper live synchronization task for groups. It will poll changelog and pull in changes</description>
-    <taskIdentifier>1494860533840-0-1</taskIdentifier>
+      oid="552112fc-9546-4e63-a170-339d99a3455e">
+    <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"/>
-    <dependent>1494860534232132-0-1</dependent>
-    <executionStatus>running</executionStatus>
+    <executionStatus>runnable</executionStatus>
     <category>Recomputation</category>
     <indestructible>true</indestructible>
-    <objectRef oid="fb0bbf07-e33f-4ddd-85a1-16a7edc237f2" type="c:ResourceType"/>
     <binding>tight</binding>
     <schedule>
         <recurrence>recurring</recurrence>
@@ -22,10 +19,8 @@
             <liveSynchronization>
                 <resourceObjects>
                     <resourceRef oid="fb0bbf07-e33f-4ddd-85a1-16a7edc237f2"/>
-                    <objectclass>GroupObjectClass</objectclass>
                 </resourceObjects>
             </liveSynchronization>
         </work>
     </activity>
 </task>
-
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 e0d378e..6f3c1e6 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
@@ -31,7 +31,7 @@
     <progress>33</progress>
     <binding>loose</binding>
     <schedule>
-        <interval>900</interval>
+        <interval>1200</interval>
     </schedule>
     <activity>
         <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 9c0e32b..75e65d9 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
@@ -44,7 +44,7 @@
     <progress>98</progress>
     <binding>loose</binding>
     <schedule>
-	<interval>900</interval>
+	<interval>1200</interval>
     </schedule>
     <activity>
         <work>