Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -rd7f8bd90added31c1bbadc8ebd51e301d13965b6 -r873a301c0dec70b20a9c31aa7183e5848f8d653f
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision d7f8bd90added31c1bbadc8ebd51e301d13965b6)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 873a301c0dec70b20a9c31aa7183e5848f8d653f)
@@ -60,6 +60,7 @@
         lazy="true"
         cascade="none"
         table="lams_user_group"
+        batch-size="20"
     >
         <key>
             <column name="group_id" />
@@ -75,6 +76,7 @@
         lazy="true"
         inverse="true"
 		cascade="none"
+        batch-size="20"
     >
         <meta attribute="field-description">
            @hibernate.set
@@ -96,7 +98,7 @@
         />
     </set>
     <!-- bi-directional many-to-one association to Grouping -->
-    <many-to-one
+    <many-to-one 
         name="grouping"
         class="org.lamsfoundation.lams.learningdesign.Grouping"
         not-null="true"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r7e008c96c3f7a56c3c90cff94b5225865b8d99ba -r873a301c0dec70b20a9c31aa7183e5848f8d653f
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 7e008c96c3f7a56c3c90cff94b5225865b8d99ba)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 873a301c0dec70b20a9c31aa7183e5848f8d653f)
@@ -32,7 +32,7 @@
     </list-->
     
     <!-- bi-directional one-to-many association to Group-->
-    <set name="groups" lazy="true" inverse="true" cascade="all-delete-orphan">
+    <set name="groups" lazy="true" inverse="true" cascade="all-delete-orphan" batch-size="10">
     	<meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
     										@hibernate.collection-key column="grouping_id" 
     										@hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Group"