diff --git a/demo/grouper/midpoint-objects-manual/tasks/task-async-update-grouper.xml b/demo/grouper/midpoint-objects-manual/tasks/task-async-update-grouper.xml
index 51c21a4..5007ae4 100644
--- a/demo/grouper/midpoint-objects-manual/tasks/task-async-update-grouper.xml
+++ b/demo/grouper/midpoint-objects-manual/tasks/task-async-update-grouper.xml
@@ -19,8 +19,7 @@
 	  xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
 	  oid="47fc57bd-8c34-4555-9b9f-7087ff179860">
 	<name>Grouper async updates</name>
-	<extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
-			   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ExtensionType">
+	<extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
 		<mext:workerThreads>1</mext:workerThreads>
 	</extension>
 	<assignment>
diff --git a/demo/grouper/midpoint-objects-manual/tasks/task-import-sis-persons.xml b/demo/grouper/midpoint-objects-manual/tasks/task-import-sis-persons.xml
index 5d98701..58189c0 100644
--- a/demo/grouper/midpoint-objects-manual/tasks/task-import-sis-persons.xml
+++ b/demo/grouper/midpoint-objects-manual/tasks/task-import-sis-persons.xml
@@ -12,9 +12,10 @@
               xsi:type="c:ExtensionType">
       <mext:kind>account</mext:kind>
       <mext:objectclass>ri:AccountObjectClass</mext:objectclass>
+<!--
       <mext:tracing>
           <interval>500</interval>
-      </mext:tracing>
+      </mext:tracing> -->
    </extension>
    <assignment>
       <targetRef oid="00000000-0000-0000-0000-000000000503" type="ArchetypeType" /> <!--Import task-->
diff --git a/demo/grouper/midpoint-objects-manual/tasks/task-recomputation-users.xml b/demo/grouper/midpoint-objects-manual/tasks/task-recomputation-users.xml
index 53657dd..179b565 100644
--- a/demo/grouper/midpoint-objects-manual/tasks/task-recomputation-users.xml
+++ b/demo/grouper/midpoint-objects-manual/tasks/task-recomputation-users.xml
@@ -3,11 +3,9 @@
       xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
       oid="83a737ea-5eb7-4e78-b431-331cccf02354">
     <name>User recomputation</name>
-    <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xsi:type="c:ExtensionType">
+    <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
         <mext:objectType>c:UserType</mext:objectType>
-        <mext:tracingInterval>200</mext:tracingInterval>
+        <!-- <mext:tracingInterval>200</mext:tracingInterval> -->
     </extension>
     <assignment>
         <targetRef oid="00000000-0000-0000-0000-000000000502" type="ArchetypeType"/> <!--Recomputation task -->
@@ -19,14 +17,6 @@
     <channel>http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#recompute</channel>
     <executionStatus>runnable</executionStatus>
     <category>Recomputation</category>
-    <workManagement>
-        <taskKind>standalone</taskKind>
-        <buckets>
-            <oidSegmentation>
-                <depth>2</depth>
-            </oidSegmentation>
-        </buckets>
-    </workManagement>
     <recurrence>single</recurrence>
     <binding>tight</binding>
 </task>
diff --git a/demo/grouper/midpoint-objects-manual/tasks/task-reconciliation-grouper-groups.xml b/demo/grouper/midpoint-objects-manual/tasks/task-reconciliation-grouper-groups.xml
index b6544ff..4e024cc 100644
--- a/demo/grouper/midpoint-objects-manual/tasks/task-reconciliation-grouper-groups.xml
+++ b/demo/grouper/midpoint-objects-manual/tasks/task-reconciliation-grouper-groups.xml
@@ -20,8 +20,7 @@
 	  xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
 	  oid="605a0127-a313-442a-9d5e-151eac8b0745">
 	<name>Grouper reconciliation (groups)</name>
-	<extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
-			   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ExtensionType">
+	<extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
 		<mext:objectclass>ri:Group</mext:objectclass>
 	</extension>
 	<assignment>
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/ordering.txt b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/ordering.txt
index 78bfa93..baf3f06 100644
--- a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/ordering.txt
+++ b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/ordering.txt
@@ -7,7 +7,7 @@ assigned/induced objects should exist. Objects that are referenced e.g. in groov
 import time.)
 
 Waves are:
-- 000: system configuration
+- 0xx: security policy and system configuration
 - 100: resources (do not depend on anything)
        root orgs (do not depend on anything)
        user template (inactive until users are imported)
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml
index 1274be7..2ed2227 100644
--- a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml
+++ b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-grouper-provided-group.xml
@@ -161,6 +161,7 @@
                             import com.evolveum.midpoint.model.impl.expr.*
                             import com.evolveum.midpoint.schema.*
                             import com.evolveum.midpoint.xml.ns._public.common.common_3.*
+                            import com.evolveum.midpoint.model.common.expression.ModelExpressionThreadLocalHolder
 
                             GROUPER_RESOURCE_OID = '1eff65de-5bb6-483d-9edf-8cc2c2ee0233'
 
@@ -189,4 +190,4 @@
          -->
         <order>2</order>
     </inducement>
-</role>
\ No newline at end of file
+</role>
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/securityPolicy/SecurityPolicy.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/securityPolicy/000-security-policy.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/securityPolicy/SecurityPolicy.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/securityPolicy/000-security-policy.xml
diff --git a/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/000-system-configuration.xml b/demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/010-system-configuration.xml
similarity index 100%
rename from demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/000-system-configuration.xml
rename to demo/grouper/midpoint_server/container_files/mp-home/post-initial-objects/systemConfigurations/010-system-configuration.xml