Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r2a8614077913fe1ea3ddf775255f4b1a26032369 -r5cbf4e85d5e743f5880e80f41283fb55f791af03
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 2a8614077913fe1ea3ddf775255f4b1a26032369)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
@@ -58,10 +58,9 @@
         <meta attribute="field-description">@hibernate.property column="offline_instructions" length="65535"</meta>    
     </property>
     
-    <property name="toolContentId" type="java.lang.Long" column="tool_content_id" length="20" >
-        <meta attribute="field-description">@hibernate.property column="tool_content_id" length="20" </meta>    
-    </property>
-    
+    <property name="activityTypeId" type="java.lang.Integer" column="learning_activity_type_id" length="11">
+    	        <meta attribute="field-description">@hibernate.property column="learning_activity_type_id" length="11"</meta>    
+   	</property>
     <property name="libraryActivityUiImage" type="java.lang.String" column="library_activity_ui_image" length="255">
         <meta attribute="field-description">@hibernate.property column="library_activity_ui_image" length="255"</meta>    
     </property>
@@ -77,37 +76,9 @@
         <column name="learning_library_id" />
     </many-to-one>
     
-    <!-- bi-directional many-to-one association to GateActivityLevel -->
-    <many-to-one name="gateActivityLevel" class="com.lamsinternational.lams.learningdesign.GateActivityLevel" not-null="true">
-        <meta attribute="field-description">@hibernate.many-to-one not-null="true"
-        							        @hibernate.column name="gate_activity_level_id"         
-        </meta>
-        <column name="gate_activity_level_id" />
-    </many-to-one>
-    
-    <!-- bi-directional one-to-many association to ProgressCurrent-->
-    <set name="progressCurrents" lazy="true" inverse="true" cascade="none">
-        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none" 
-        							        @hibernate.collection-key column="activity_id"
-        							        @hibernate.collection-one-to-many class="com.lamsinternational.lams.lesson.ProgressCurrent"
-        </meta>
-        <key><column name="activity_id" /></key>
-        <one-to-many class="com.lamsinternational.lams.lesson.ProgressCurrent"/>
-    </set>
-    
-    <!-- bi-directional one-to-many association to ProgressCompleted-->
-    <set name="progressCompleteds" lazy="true" inverse="true" cascade="none" >
-        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none" 
-        						            @hibernate.collection-key column="activity_id"
-        						            @hibernate.collection-one-to-many class="com.lamsinternational.lams.lesson.ProgressCompleted"
-        </meta>
-        <key><column name="activity_id" /></key>
-        <one-to-many class="com.lamsinternational.lams.lesson.ProgressCompleted"/>
-    </set>
-    
     <!-- bi-directional one-to-many association to Transition -->
-    <set name="transitionsByToActivityId" lazy="true" inverse="true" cascade="none">
-        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none" 
+    <set name="transitionsByToActivityId" lazy="false" inverse="true" cascade="none">
+        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none" 
         						            @hibernate.collection-key column="to_activity_id"
         						            @hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Transition"
         </meta>
@@ -116,39 +87,23 @@
     </set>
     
     <!-- bi-directional one-to-many association to Transition -->
-    <set name="transitionsByFromActivityId" lazy="true" inverse="true" cascade="none" >
-        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
+    <set name="transitionsByFromActivityId" lazy="false" inverse="true" cascade="none" >
+        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
         							        @hibernate.collection-key column="from_activity_id"
         							        @hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Transition"
         </meta>
         <key><column name="from_activity_id" /></key>
         <one-to-many class="com.lamsinternational.lams.learningdesign.Transition"/>
     </set>
     
-    <!-- bi-directional one-to-many association to Activity -->
-    <set name="activities" lazy="true" inverse="true" cascade="none" >
-        <meta attribute="field-description">@hibernate.set lazy="true" inverse="true" cascade="none"
-        						            @hibernate.collection-key column="parent_activity_id"
-									        @hibernate.collection-one-to-many class="com.lamsinternational.lams.learningdesign.Activity"
-        </meta>
-        <key><column name="parent_activity_id" /></key>
-        <one-to-many class="com.lamsinternational.lams.learningdesign.Activity"/>
-    </set>
-    
     <!-- bi-directional many-to-one association to Activity -->
-    <many-to-one name="activity" class="com.lamsinternational.lams.learningdesign.Activity" not-null="true">
+    <many-to-one name="parentActivity" class="com.lamsinternational.lams.learningdesign.Activity" not-null="true">
         <meta attribute="field-description">@hibernate.many-to-one not-null="true"
 									        @hibernate.column name="parent_activity_id"         
         </meta>
         <column name="parent_activity_id" />
     </many-to-one>
-    
-    <!-- bi-directional many-to-one association to Tool -->
-    <many-to-one name="tool" class="com.lamsinternational.lams.tool.Tool" not-null="true" >
-        <meta attribute="field-description">@hibernate.many-to-one not-null="true" @hibernate.column name="tool_id"</meta>
-        <column name="tool_id" />
-    </many-to-one>
-    
+        
     <!-- bi-directional many-to-one association to LearningDesign -->
     <many-to-one name="learningDesign" class="com.lamsinternational.lams.learningdesign.LearningDesign" not-null="true">
         <meta attribute="field-description">@hibernate.many-to-one not-null="true" 
@@ -165,33 +120,39 @@
         <column name="grouping_id" />
     </many-to-one>
     
-    <!-- bi-directional many-to-one association to ActivityType -->
-    <many-to-one name="activityType" class="com.lamsinternational.lams.learningdesign.ActivityType" not-null="true">
-        <meta attribute="field-description">@hibernate.many-to-one not-null="true" 
-        									@hibernate.column name="learning_activity_type_id"         
-        </meta>
-        <column name="learning_activity_type_id" />
-    </many-to-one>
-    
     <!-- Subclass definations for polymorphic persistence -->
     <subclass name="com.lamsinternational.lams.learningdesign.SimpleActivity">
      	 <meta attribute="class-description" inherit="false">@hibernate.class </meta>
          <meta attribute="scope-class" inherit="false">public abstract</meta>
-			<subclass name="com.lamsinternational.lams.learningdesign.ToolActivity">
+			<subclass name="com.lamsinternational.lams.learningdesign.ToolActivity" discriminator-value="1">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				<property name="toolContentId" type="java.lang.Long" column="tool_content_id" length="20" />
+                 
+                 <!-- bi-directional many-to-one association to Tool -->
+                 <many-to-one name="tool" class="com.lamsinternational.lams.tool.Tool" >
+                 	<column name="tool_id" />
+                 </many-to-one>
 			</subclass>
+			
 			<subclass name="com.lamsinternational.lams.learningdesign.GroupingActivity">
-				<meta attribute="class-description" inherit="false">@hibernate.class </meta>				
-				<subclass name="com.lamsinternational.lams.learningdesign.ChosenGroupingActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				
+				 <!-- bi-directional many-to-one association to Grouping -->
+                  <many-to-one name="createGrouping" class="com.lamsinternational.lams.learningdesign.Grouping" not-null="true">
+                  	<column name="create_grouping_id" />
+                  </many-to-one>					
+                  
+				<subclass name="com.lamsinternational.lams.learningdesign.ChosenGroupingActivity" discriminator-value="3">
 					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				</subclass>
-				<subclass name="com.lamsinternational.lams.learningdesign.RandomGroupingActivity">
+				<subclass name="com.lamsinternational.lams.learningdesign.RandomGroupingActivity" discriminator-value="2">
 					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				</subclass>				
 			</subclass>
 			<subclass name="com.lamsinternational.lams.learningdesign.GateActivity">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
-				<subclass name="com.lamsinternational.lams.learningdesign.ScheduleGateActivity">
+				<property name="gateActivityLevelId" type="java.lang.Integer" column="gate_activity_level_id" length="11"/>
+				<subclass name="com.lamsinternational.lams.learningdesign.ScheduleGateActivity" discriminator-value="5">
 					<meta attribute="class-description" inherit="false">@hibernate.class </meta>					
 					<property name="gateStartDateTime" type="java.sql.Timestamp" column="gate_start_date_time" length="19">
         				<meta attribute="field-description">@hibernate.property column="gate_start_date_time" length="19"</meta>    
@@ -202,10 +163,10 @@
 			    		<meta attribute="use-in-toString">true</meta>
 				    </property>
 				</subclass>
-				<subclass name="com.lamsinternational.lams.learningdesign.SynchGateActivity">
+				<subclass name="com.lamsinternational.lams.learningdesign.SynchGateActivity" discriminator-value="4">
 					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				</subclass>
-				<subclass name="com.lamsinternational.lams.learningdesign.PermissionGateActivity">
+				<subclass name="com.lamsinternational.lams.learningdesign.PermissionGateActivity" discriminator-value="6">
 					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				</subclass>
 			</subclass>			
@@ -214,7 +175,14 @@
 	<subclass name="com.lamsinternational.lams.learningdesign.ComplexActivity">
 		<meta attribute="class-description" inherit="false">@hibernate.class </meta>			
 	    <meta attribute="scope-class" inherit="false">public abstract</meta>
-			<subclass name="com.lamsinternational.lams.learningdesign.OptionsActivity">
+	    <!-- bi-directional one-to-many association to Activity -->
+        <list name="activities" lazy="true" inverse="true" cascade="none" >
+        	<index column="order_id"/>                                  
+            <key><column name="parent_activity_id" /></key>
+            <one-to-many class="com.lamsinternational.lams.learningdesign.Activity"/>
+        </list>
+		
+			<subclass name="com.lamsinternational.lams.learningdesign.OptionsActivity" discriminator-value="8">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 				<property name="maxNumberOfOptions" type="java.lang.Integer" column="max_number_of_options" length="5">
 					<meta attribute="field-description">@hibernate.property column="max_number_of_options" length="5"</meta>    
@@ -225,10 +193,10 @@
 					<meta attribute="use-in-toString">true</meta>
 			    </property>
 			</subclass>
-			<subclass name="com.lamsinternational.lams.learningdesign.SequenceActivity">
+			<subclass name="com.lamsinternational.lams.learningdesign.SequenceActivity" discriminator-value="9">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 			</subclass>
-			<subclass name="com.lamsinternational.lams.learningdesign.ParallelActivity">
+			<subclass name="com.lamsinternational.lams.learningdesign.ParallelActivity" discriminator-value="7">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
 			</subclass>
 	</subclass>
Fisheye: Tag 5cbf4e85d5e743f5880e80f41283fb55f791af03 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/ActivityType.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 5cbf4e85d5e743f5880e80f41283fb55f791af03 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/GateActivityLevel.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e -r5cbf4e85d5e743f5880e80f41283fb55f791af03
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
@@ -54,30 +54,20 @@
 
     <!-- Associations -->
   
-    <!-- bi-directional one-to-many association to UserGroup -->
+    <!-- bi-directional one-to-many association to User -->
     <set
-        name="userGroups"
+        name="users"
         lazy="true"
         inverse="true"
-		cascade="none"
+        cascade="none"
+        table="lams_user_group"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="group_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.lesson.UserGroup"
-        </meta>
         <key>
             <column name="group_id" />
         </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.lesson.UserGroup"
+        <many-to-many 
+            column="user_id"
+            class="com.lamsinternational.lams.usermanagement.User"
         />
     </set>
     <!-- bi-directional one-to-many association to ToolSession -->
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e -r5cbf4e85d5e743f5880e80f41283fb55f791af03
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
@@ -4,173 +4,90 @@
     "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
     
 <hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
 
 <class 
     name="com.lamsinternational.lams.learningdesign.Grouping" 
     table="lams_grouping"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_grouping"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
-
+    <discriminator column="grouping_type_id" type="int"/>
     <id
         name="groupingId"
         type="java.lang.Long"
         column="grouping_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="identity"
-            type="java.lang.Long"
-            column="grouping_id"
-
-
-        </meta>
         <generator class="identity" />
     </id>
 
-    <property
-        name="numberOfGroups"
-        type="java.lang.Integer"
-        column="number_of_groups"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="number_of_groups"
-            length="11"
-        </meta>    
-    </property>
-    <property
-        name="learnersPerGroup"
-        type="java.lang.Integer"
-        column="learners_per_group"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="learners_per_group"
-            length="11"
-        </meta>    
-    </property>
-    <property
-        name="staffGroupId"
-        type="java.lang.Long"
-        column="staff_group_id"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="staff_group_id"
-            length="20"
-        </meta>    
-    </property>
-    
-    <property name="maxNumberOfGroups" type="java.lang.Integer" column="max_number_of_groups" length="3">
-        <meta attribute="field-description">@hibernate.property column="max_number_of_groups" length="3"</meta>    
-    </property>
+    <property name="maxNumberOfGroups" type="java.lang.Integer" column="max_number_of_groups" length="3"/>
 
     <!-- Associations -->
-  
-    <!-- bi-directional many-to-one association to GroupingType -->
-    <many-to-one
-        name="groupingType"
-        class="com.lamsinternational.lams.learningdesign.GroupingType"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="grouping_type_id"         
-        </meta>
-        <column name="grouping_type_id" />
-    </many-to-one>
-    <!-- bi-directional one-to-many association to Group -->
-    <set
+
+    <list
         name="groups"
         lazy="true"
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="grouping_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.Group"
-        </meta>
         <key>
             <column name="grouping_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.learningdesign.Group"
         />
-    </set>
-    <!-- bi-directional one-to-many association to Lesson -->
+        <index
+            column="order_id"                                     
+        />
+    </list>
+   
+    <!-- bi-directional one-to-many association to Activity -->
     <set
-        name="lessons"
+        name="activities"
         lazy="true"
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="class_grouping_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.lesson.Lesson"
-        </meta>
         <key>
-            <column name="class_grouping_id" />
+            <column name="grouping_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.lesson.Lesson"
+            class="com.lamsinternational.lams.learningdesign.Activity"
         />
     </set>
-    <!-- bi-directional one-to-many association to Activity -->
+
+    <subclass name="com.lamsinternational.lams.learningdesign.RandomGrouping" discriminator-value="1">
+        <property
+        name="numberOfGroups"
+        type="java.lang.Integer"
+        column="number_of_groups"
+        length="11"
+        />
+        <property
+        name="learnersPerGroup"
+        type="java.lang.Integer"
+        column="learners_per_group"
+        length="11"
+        />
+    </subclass>
+    <subclass name="com.lamsinternational.lams.learningdesign.ChosenGrouping" discriminator-value="2"/>
+        
+    <subclass name="com.lamsinternational.lams.lesson.LessonClass" discriminator-value="3">
+        <!-- bi-directional many-to-one (effectiviey a  one to one) assocaites to Group in staff group role -->
+        <many-to-one name="staffGroup" class="com.lamsinternational.lams.learningdesign.Group" column="staff_group_id" unique="true"/>
+         <!-- bi-directional one-to-many association to Lesson -->
     <set
-        name="activities"
+        name="lessons"
         lazy="true"
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="grouping_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.Activity"
-        </meta>
         <key>
-            <column name="grouping_id" />
+            <column name="class_grouping_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.Activity"
+            class="com.lamsinternational.lams.lesson.Lesson"
         />
     </set>
-
+    </subclass>
 </class>
 </hibernate-mapping>
Fisheye: Tag 5cbf4e85d5e743f5880e80f41283fb55f791af03 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/GroupingType.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e -r5cbf4e85d5e743f5880e80f41283fb55f791af03
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
@@ -15,25 +15,15 @@
     name="com.lamsinternational.lams.learningdesign.LearningDesign" 
     table="lams_learning_design"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_learning_design"
-    </meta>
+    
     <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="learningDesignId"
         type="java.lang.Long"
         column="learning_design_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="identity"
-            type="java.lang.Long"
-            column="learning_design_id"
-
-
-        </meta>
+       
         <generator class="identity" />
     </id>
 
@@ -43,59 +33,38 @@
         column="id"
         length="11"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="id"
-            length="11"
-        </meta>    
+         
     </property>
     <property
         name="description"
         type="java.lang.String"
         column="description"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+          
     </property>
     <property
         name="title"
         type="java.lang.String"
         column="title"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="title"
-            length="255"
-        </meta>    
     </property>
     <property
         name="firstActivityId"
         type="java.lang.Long"
         column="first_activity_id"
         length="20"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="first_activity_id"
-            length="20"
-        </meta>    
+         
     </property>
     <property
         name="maxId"
         type="java.lang.Integer"
         column="max_id"
         length="11"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="max_id"
-            length="11"
-        </meta>    
+      
     </property>
     <property
         name="validDesign"
@@ -118,25 +87,15 @@
         not-null="true"
         length="4"
     >
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description">
-           @hibernate.property
-            column="read_only_flag"
-            length="4"
-            not-null="true"
-        </meta>    
+         
     </property>
     <property
         name="dateReadOnly"
         type="java.sql.Timestamp"
         column="date_read_only"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="date_read_only"
-            length="19"
-        </meta>    
+       
     </property>
     <property
         name="readAccess"
@@ -156,23 +115,15 @@
         column="write_access"
         length="20"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="write_access"
-            length="20"
-        </meta>    
+         
     </property>
     <property
         name="helpText"
         type="java.lang.String"
         column="help_text"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="help_text"
-            length="65535"
-        </meta>    
+          
     </property>
     <property
         name="lessonCopy"
@@ -181,12 +132,7 @@
         not-null="true"
         length="4"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="lesson_copy_flag"
-            length="4"
-            not-null="true"
-        </meta>    
+          
     </property>
     <property
         name="createDateTime"
@@ -195,12 +141,7 @@
         not-null="true"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="create_date_time"
-            length="19"
-            not-null="true"
-        </meta>    
+         
     </property>
     <property
         name="version"
@@ -222,23 +163,15 @@
         column="open_date_time"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="open_date_time"
-            length="19"
-        </meta>    
+      
     </property>
     <property
         name="closeDateTime"
         type="java.sql.Timestamp"
         column="close_date_time"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="close_date_time"
-            length="19"
-        </meta>    
+        
     </property>
 
     <!-- Associations -->
@@ -249,32 +182,15 @@
         class="com.lamsinternational.lams.usermanagement.User"
         not-null="true"
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="user_id"         
-        </meta>
         <column name="user_id" />
     </many-to-one>
     <!-- bi-directional one-to-many association to LearningDesign -->
     <set
-        name="learningDesigns"
+        name="childLearningDesigns"
         lazy="true"
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="parent_learning_design_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.LearningDesign"
-        </meta>
         <key>
             <column name="parent_learning_design_id" />
         </key>
@@ -284,15 +200,10 @@
     </set>
     <!-- bi-directional many-to-one association to LearningDesign -->
     <many-to-one
-        name="learningDesign"
+        name="parentLearningDesign"
         class="com.lamsinternational.lams.learningdesign.LearningDesign"
-        not-null="true"
+
     >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="parent_learning_design_id"         
-        </meta>
         <column name="parent_learning_design_id" />
     </many-to-one>
     <!-- bi-directional one-to-many association to Lesson -->
@@ -302,18 +213,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="learning_design_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.lesson.Lesson"
-        </meta>
+        
         <key>
             <column name="learning_design_id" />
         </key>
@@ -328,18 +228,7 @@
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="learning_design_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.Transition"
-        </meta>
+       
         <key>
             <column name="learning_design_id" />
         </key>
@@ -348,31 +237,23 @@
         />
     </set>
     <!-- bi-directional one-to-many association to Activity -->
-    <set
+    <list
         name="activities"
         lazy="true"
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="learning_design_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.Activity"
-        </meta>
+       
         <key>
             <column name="learning_design_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.learningdesign.Activity"
         />
-    </set>
+        <index
+            column="order_id"                                     
+        />
+    </list>
 
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -reae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e -r5cbf4e85d5e743f5880e80f41283fb55f791af03
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision eae5386d67e9b2e0d7f38d7e61bc1d3b9867f44e)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 5cbf4e85d5e743f5880e80f41283fb55f791af03)
@@ -15,25 +15,15 @@
     name="com.lamsinternational.lams.learningdesign.LearningLibrary" 
     table="lams_learning_library"
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_learning_library"
-    </meta>
+ 
     <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="learningLibraryId"
         type="java.lang.Long"
         column="learning_library_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="identity"
-            type="java.lang.Long"
-            column="learning_library_id"
-
-
-        </meta>
+ 
         <generator class="identity" />
     </id>
 
@@ -43,23 +33,15 @@
         column="description"
         length="65535"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="description"
-            length="65535"
-        </meta>    
+ 
     </property>
     <property
         name="title"
         type="java.lang.String"
         column="title"
         length="255"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="title"
-            length="255"
-        </meta>    
+
     </property>
     <property
         name="createDateTime"
@@ -68,42 +50,27 @@
         not-null="true"
         length="19"
     >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="create_date_time"
-            length="19"
-            not-null="true"
-        </meta>    
+ 
     </property>
 
     <!-- Associations -->
   
     <!-- bi-directional one-to-many association to Activity -->
-    <set
+    <list
         name="activities"
         lazy="true"
         inverse="true"
 		cascade="none"
     >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
-
-           @hibernate.collection-key
-            column="learning_library_id"
-
-           @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.Activity"
-        </meta>
+        
         <key>
             <column name="learning_library_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.learningdesign.Activity"
         />
-    </set>
+        <index column="order_id"/>
+    </list>
 
 </class>
 </hibernate-mapping>