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/internet2.xsd
similarity index 73%
rename from demo/complex/midpoint_server/container_files/mp-home/schema/user-schema.xsd
rename to demo/complex/midpoint_server/container_files/mp-home/schema/internet2.xsd
index 00d479b..4c8e3af 100644
--- a/demo/complex/midpoint_server/container_files/mp-home/schema/user-schema.xsd
+++ b/demo/complex/midpoint_server/container_files/mp-home/schema/internet2.xsd
@@ -17,6 +17,17 @@
         <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:complexType name="OrgExtensionType">
+    <xsd:annotation>
+      <xsd:appinfo>
+        <a:extension ref="c:OrgType"/>
+      </xsd:appinfo>
+    </xsd:annotation>
+    <xsd:sequence>
+        <xsd:element name="grouperName" type="xsd:string" minOccurs="0"/>
+    </xsd:sequence>
   </xsd:complexType>  
 </xsd:schema>
 
diff --git a/demo/complex2/add-ref-groups.gsh b/demo/complex2/add-ref-groups.gsh
index 0e952ac..7697f99 100644
--- a/demo/complex2/add-ref-groups.gsh
+++ b/demo/complex2/add-ref-groups.gsh
@@ -20,7 +20,7 @@ def supergroup = GroupFinder.findByName(gs, "etc:midpointGroups", true)
 def cs = GroupFinder.findByName(gs, "app:cs", true)
 
 addGroups(gs, StemFinder.findByName(gs, 'ref:affiliation'), supergroup, null)
-//addGroups(gs, StemFinder.findByName(gs, 'ref:dept'), null)
-//addGroups(gs, StemFinder.findByName(gs, 'ref:course'), null)
+addGroups(gs, StemFinder.findByName(gs, 'ref:dept'), supergroup, null)
+addGroups(gs, StemFinder.findByName(gs, 'ref:course'), supergroup, null)
 
 addGroups(gs, StemFinder.findByName(gs, 'ref:course'), cs, /CS.*/)
diff --git a/demo/complex2/midpoint_server/container_files/mp-home/schema/user-schema.xsd b/demo/complex2/midpoint_server/container_files/mp-home/schema/internet2.xsd
similarity index 73%
rename from demo/complex2/midpoint_server/container_files/mp-home/schema/user-schema.xsd
rename to demo/complex2/midpoint_server/container_files/mp-home/schema/internet2.xsd
index 00d479b..4c8e3af 100644
--- a/demo/complex2/midpoint_server/container_files/mp-home/schema/user-schema.xsd
+++ b/demo/complex2/midpoint_server/container_files/mp-home/schema/internet2.xsd
@@ -17,6 +17,17 @@
         <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:complexType name="OrgExtensionType">
+    <xsd:annotation>
+      <xsd:appinfo>
+        <a:extension ref="c:OrgType"/>
+      </xsd:appinfo>
+    </xsd:annotation>
+    <xsd:sequence>
+        <xsd:element name="grouperName" type="xsd:string" minOccurs="0"/>
+    </xsd:sequence>
   </xsd:complexType>  
 </xsd:schema>