Index: lams_common/conf/hibernate/mappings/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r7be08bdc387f5f78514d44a89caab0ba1eea7655 -r75c68086ca1df84b98d4f53ca4e152071ceb8b06
--- lams_common/conf/hibernate/mappings/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 7be08bdc387f5f78514d44a89caab0ba1eea7655)
+++ lams_common/conf/hibernate/mappings/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 75c68086ca1df84b98d4f53ca4e152071ceb8b06)
@@ -11,162 +11,72 @@
     http://www.hibernate.org/
 -->
 
-<class 
-    name="com.lamsinternational.lams.learningdesign.LamsLearningActivity" 
-    table="lams_learning_activity"
->
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_learning_activity"
-    </meta>
+<class name="com.lamsinternational.lams.learningdesign.Activity" table="lams_learning_activity">
+    <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity" </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+    <meta attribute="scope-class" inherit="false">public abstract</meta>    
 
-    <id
-        name="activityId"
-        type="java.lang.Long"
-        column="activity_id"
-    >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="assigned"
-            type="java.lang.Long"
-            column="activity_id"
-
-        </meta>
+    <id name="activityId" type="java.lang.Long" column="activity_id">
+        <meta attribute="field-description">@hibernate.id generator-class="assigned" type="java.lang.Long" column="activity_id" </meta>
         <generator class="assigned" />
     </id>
 
-    <property
-        name="id"
-        type="java.lang.Integer"
-        column="id"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="id"
-            length="11"
-        </meta>    
+    <property name="id" type="java.lang.Integer" column="id" length="11" >
+        <meta attribute="field-description">@hibernate.property column="id" length="11" </meta>
+        <meta attribute="use-in-toString">true</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 name="description" type="java.lang.String" column="description" length="65535" >
+        <meta attribute="field-description">@hibernate.property column="description" length="65535"</meta>    
+        <meta attribute="use-in-toString">true</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 name="title" type="java.lang.String" column="title" length="255">
+        <meta attribute="field-description">@hibernate.property column="title" length="255"</meta>   
+        <meta attribute="use-in-toString">true</meta> 
     </property>
-    <property
-        name="xcoord"
-        type="java.lang.Integer"
-        column="xcoord"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="xcoord"
-            length="11"
-        </meta>    
+    <property name="xcoord" type="java.lang.Integer" column="xcoord" length="11" >
+        <meta attribute="field-description">@hibernate.property column="xcoord" length="11"</meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="ycoord"
-        type="java.lang.Integer"
-        column="ycoord"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="ycoord"
-            length="11"
-        </meta>    
+    <property name="ycoord" type="java.lang.Integer" column="ycoord" length="11">
+        <meta attribute="field-description">@hibernate.property column="ycoord" length="11" </meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="orderId"
-        type="java.lang.Integer"
-        column="order_id"
-        length="11"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="order_id"
-            length="11"
-        </meta>    
+    <property name="orderId" type="java.lang.Integer" column="order_id" length="11">
+    	<meta attribute="field-description">@hibernate.property column="order_id" length="11"</meta>    
+    	<meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="defineLaterFlag"
-        type="byte"
-        column="define_later_flag"
-        not-null="true"
-        length="4"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="define_later_flag"
-            length="4"
-            not-null="true"
-        </meta>    
+    <property name="defineLater" type="java.lang.Boolean" column="define_later_flag" not-null="true" length="4">
+        <meta attribute="field-description"> @hibernate.property column="define_later_flag" length="4" not-null="true" </meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="createDateTime"
-        type="java.sql.Timestamp"
-        column="create_date_time"
-        not-null="true"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="create_date_time"
-            length="19"
-            not-null="true"
-        </meta>    
+    <property name="createDateTime" type="java.sql.Timestamp" column="create_date_time" not-null="true" length="19">
+    	<meta attribute="field-description">@hibernate.property column="create_date_time" length="19" not-null="true" </meta>    
+    	<meta attribute="use-in-toString">true</meta>
     </property>
-    <property
-        name="offlineInstructions"
-        type="java.lang.String"
-        column="offline_instructions"
-        length="65535"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="offline_instructions"
-            length="65535"
-        </meta>    
+    <property name="offlineInstructions" type="java.lang.String" column="offline_instructions" length="65535">
+        <meta attribute="field-description">@hibernate.property column="offline_instructions" length="65535"</meta>    
+        <meta attribute="use-in-toString">true</meta>
     </property>
-
+    
     <!-- Associations -->
   
-    <!-- bi-directional many-to-one association to LamsLearningGrouping -->
+    <!-- bi-directional many-to-one association to Grouping -->
     <many-to-one
-        name="lamsLearningGrouping"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningGrouping"
+        name="grouping"
+        class="com.lamsinternational.lams.learningdesign.Grouping"
         not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="learning_grouping_id"         
+           @hibernate.column name="grouping_id"         
         </meta>
-        <column name="learning_grouping_id" />
+        <column name="grouping_id" />
     </many-to-one>
-    <!-- bi-directional many-to-one association to LamsLearningLibrary -->
+    <!-- bi-directional many-to-one association to LearningLibrary -->
     <many-to-one
-        name="lamsLearningLibrary"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningLibrary"
+        name="learningLibrary"
+        class="com.lamsinternational.lams.learningdesign.LearningLibrary"
         not-null="true"
     >
         <meta attribute="field-description">
@@ -176,31 +86,22 @@
         </meta>
         <column name="learning_library_id" />
     </many-to-one>
-    <!-- bi-directional one-to-one association to LamsLearningToolActivity -->
-    <one-to-one
-        name="lamsLearningToolActivity"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningToolActivity"
-        outer-join="auto"
+    <!-- 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.one-to-one
-            outer-join="auto"
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="learning_design_id"         
         </meta>
-    </one-to-one>
-    <!-- bi-directional one-to-one association to LamsLearningGateActivity -->
-    <one-to-one
-        name="lamsLearningGateActivity"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningGateActivity"
-        outer-join="auto"
-    >
-        <meta attribute="field-description">
-           @hibernate.one-to-one
-            outer-join="auto"
-        </meta>
-    </one-to-one>
-    <!-- bi-directional one-to-many association to LamsLearningTransition -->
+        <column name="learning_design_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to Transition -->
     <set
-        name="lamsLearningTransitionsByToActivityId"
+        name="transitionsByToActivityId"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -215,18 +116,18 @@
             column="to_activity_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.LamsLearningTransition"
+            class="com.lamsinternational.lams.learningdesign.Transition"
         </meta>
         <key>
             <column name="to_activity_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.LamsLearningTransition"
+            class="com.lamsinternational.lams.learningdesign.Transition"
         />
     </set>
-    <!-- bi-directional one-to-many association to LamsLearningTransition -->
+    <!-- bi-directional one-to-many association to Transition -->
     <set
-        name="lamsLearningTransitionsByFromActivityId"
+        name="transitionsByFromActivityId"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -241,18 +142,18 @@
             column="from_activity_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.LamsLearningTransition"
+            class="com.lamsinternational.lams.learningdesign.Transition"
         </meta>
         <key>
             <column name="from_activity_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.LamsLearningTransition"
+            class="com.lamsinternational.lams.learningdesign.Transition"
         />
     </set>
-    <!-- bi-directional one-to-many association to LamsLearningActivity -->
+    <!-- bi-directional one-to-many association to Activity -->
     <set
-        name="lamsLearningActivities"
+        name="activities"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -267,19 +168,19 @@
             column="parent_activity_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.LamsLearningActivity"
+            class="com.lamsinternational.lams.learningdesign.Activity"
         </meta>
         <key>
             <column name="parent_activity_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.LamsLearningActivity"
+            class="com.lamsinternational.lams.learningdesign.Activity"
         />
     </set>
-    <!-- bi-directional many-to-one association to LamsLearningActivity -->
+    <!-- bi-directional many-to-one association to Activity -->
     <many-to-one
-        name="lamsLearningActivity"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningActivity"
+        name="activity"
+        class="com.lamsinternational.lams.learningdesign.Activity"
         not-null="true"
     >
         <meta attribute="field-description">
@@ -289,54 +190,64 @@
         </meta>
         <column name="parent_activity_id" />
     </many-to-one>
-    <!-- bi-directional one-to-one association to LamsLearningGroupingActivity -->
-    <one-to-one
-        name="lamsLearningGroupingActivity"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningGroupingActivity"
-        outer-join="auto"
-    >
-        <meta attribute="field-description">
-           @hibernate.one-to-one
-            outer-join="auto"
-        </meta>
-    </one-to-one>
-    <!-- bi-directional one-to-one association to LamsLearningOptionsActivity -->
-    <one-to-one
-        name="lamsLearningOptionsActivity"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningOptionsActivity"
-        outer-join="auto"
-    >
-        <meta attribute="field-description">
-           @hibernate.one-to-one
-            outer-join="auto"
-        </meta>
-    </one-to-one>
-    <!-- bi-directional many-to-one association to LamsLearningDesign -->
-    <many-to-one
-        name="lamsLearningDesign"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningDesign"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="learning_design_id"         
-        </meta>
-        <column name="learning_design_id" />
-    </many-to-one>
-    <!-- bi-directional many-to-one association to LamsLearningActivityType -->
-    <many-to-one
-        name="lamsLearningActivityType"
-        class="com.lamsinternational.lams.learningdesign.LamsLearningActivityType"
-        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 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">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</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>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.RandomGroupingActivity">
+					<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>
+							
+				<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>    
+        			<meta attribute="use-in-toString">true</meta>
+			    </property>
+			    <property name="gateEndDateTime" type="java.sql.Timestamp" column="gate_end_date_time" length="19" >
+			    	<meta attribute="field-description">@hibernate.property column="gate_end_date_time" length="19" </meta>    
+			    	<meta attribute="use-in-toString">true</meta>
+			    </property>				
+				<subclass name="com.lamsinternational.lams.learningdesign.ScheduleGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.SynchGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.PermissionGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+			</subclass>			
+	</subclass>
 
+	<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">
+				<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>    
+					<meta attribute="use-in-toString">true</meta>
+				</property>
+			    <property name="minNumberOfOptions" type="java.lang.Integer" column="min_number_of_options" length="5">
+					<meta attribute="field-description">@hibernate.property column="min_number_of_options" length="5"</meta> 
+					<meta attribute="use-in-toString">true</meta>
+			    </property>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.SequenceActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.ParallelActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+	</subclass>
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/learningdesign/Group.hbm.xml
===================================================================
diff -u -r7be08bdc387f5f78514d44a89caab0ba1eea7655 -r75c68086ca1df84b98d4f53ca4e152071ceb8b06
--- lams_common/conf/hibernate/mappings/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 7be08bdc387f5f78514d44a89caab0ba1eea7655)
+++ lams_common/conf/hibernate/mappings/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 75c68086ca1df84b98d4f53ca4e152071ceb8b06)
@@ -9,17 +9,15 @@
 
     http://boss.bekk.no/boss/middlegen/
     http://www.hibernate.org/
-    
-    modified by Chris Perfect
 -->
 
 <class 
     name="com.lamsinternational.lams.learningdesign.Group" 
-    table="lams_learning_group"
+    table="lams_group"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
-        table="lams_learning_group"
+        table="lams_group"
     </meta>
 
     <id
@@ -33,37 +31,41 @@
             type="java.lang.Long"
             column="group_id"
 
+
         </meta>
         <generator class="assigned" />
     </id>
 
+    <property
+        name="orderId"
+        type="int"
+        column="order_id"
+        not-null="true"
+        length="6"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="order_id"
+            length="6"
+            not-null="true"
+        </meta>    
+    </property>
 
     <!-- Associations -->
   
-   <set
-        name="users"
-        table="lams_user_group"
-        lazy="true"
-   >
+    <!-- bi-directional many-to-one association to Grouping -->
+    <many-to-one
+        name="grouping"
+        class="com.lamsinternational.lams.learningdesign.Grouping"
+        not-null="true"
+    >
         <meta attribute="field-description">
-           @hibernate.set
-            role="users"
-            table="lams_user-group"
-            lazy="true"
-           
-           @hibernate.collection-key
-            column="group_id"
-            
-           @hibernate.collection-many-to-many
-            class="com.lamsinternational.lams.usermanagement.User"
-            column="user_id"
-
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="grouping_id"         
         </meta>
-        <key>
-            <column name="group_id"/>
-        </key>
-        <many-to-many class="com.lamsinternational.lams.usermanagement.User" column="user_id"/>
-   </set> 
+        <column name="grouping_id" />
+    </many-to-one>
 
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -r7be08bdc387f5f78514d44a89caab0ba1eea7655 -r75c68086ca1df84b98d4f53ca4e152071ceb8b06
--- lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 7be08bdc387f5f78514d44a89caab0ba1eea7655)
+++ lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 75c68086ca1df84b98d4f53ca4e152071ceb8b06)
@@ -9,20 +9,18 @@
 
     http://boss.bekk.no/boss/middlegen/
     http://www.hibernate.org/
-    
-    Modified by Chris Perfect
 -->
 
 <class 
     name="com.lamsinternational.lams.learningdesign.Grouping" 
-    table="lams_learning_grouping"
+    table="lams_grouping"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
-        table="lams_learning_grouping"
+        table="lams_grouping"
     </meta>
-    <discriminator column="grouping_type_id" type="int"/>
-    
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
     <id
         name="groupingId"
         type="java.lang.Long"
@@ -34,6 +32,7 @@
             type="java.lang.Long"
             column="grouping_id"
 
+
         </meta>
         <generator class="assigned" />
     </id>
@@ -62,18 +61,30 @@
             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>
 
     <!-- Associations -->
   
-    <!-- bi-directional one-to-many association to LamsLearningGroup -->
+    <!-- bi-directional one-to-many association to Group -->
     <set
         name="groups"
         lazy="true"
         inverse="true"
-	cascade="none"
+		cascade="none"
     >
         <meta attribute="field-description">
-           @hibernate.list
+           @hibernate.set
             lazy="true"
             inverse="true"
             cascade="none"
@@ -84,21 +95,39 @@
            @hibernate.collection-one-to-many
             class="com.lamsinternational.lams.learningdesign.Group"
         </meta>
-        <index>
-            <column name="order_id"/>
-        <index>
         <key>
             <column name="grouping_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.learningdesign.Group"
         />
     </set>
-    
-    <subclass name="com.lamsinternational.lams.lesson.Class" discriminator-value="2">
-        <many-to-one name="staffGroup" class="com.lamsinternational.lams.learningdesign.Group" column="staff_group_id" unique="true"/>
-    </sublcass>
-    
+    <!-- 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="grouping_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="grouping_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r7be08bdc387f5f78514d44a89caab0ba1eea7655 -r75c68086ca1df84b98d4f53ca4e152071ceb8b06
--- lams_common/conf/hibernate/mappings/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 7be08bdc387f5f78514d44a89caab0ba1eea7655)
+++ lams_common/conf/hibernate/mappings/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 75c68086ca1df84b98d4f53ca4e152071ceb8b06)
@@ -12,13 +12,14 @@
 -->
 
 <class 
-    name="com.lamsinternational.lams.learningdesign.LamsLearningDesign" 
+    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"
@@ -31,6 +32,7 @@
             type="java.lang.Long"
             column="learning_design_id"
 
+
         </meta>
         <generator class="assigned" />
     </id>
@@ -71,12 +73,19 @@
             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"
@@ -89,39 +98,31 @@
         </meta>    
     </property>
     <property
-        name="objectType"
-        type="java.lang.String"
-        column="object_type"
-        length="255"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="object_type"
-            length="255"
-        </meta>    
-    </property>
-    <property
         name="validDesign"
-        type="boolean"
+        type="java.lang.Boolean"
         column="valid_design_flag"
+        not-null="true"
         length="4"
     >
         <meta attribute="field-description">
            @hibernate.property
             column="valid_design_flag"
             length="4"
+            not-null="true"
         </meta>    
     </property>
     <property
         name="readOnly"
-        type="boolean"
+        type="java.lang.Boolean"
         column="read_only_flag"
+        not-null="true"
         length="4"
     >
         <meta attribute="field-description">
            @hibernate.property
             column="read_only_flag"
             length="4"
+            not-null="true"
         </meta>    
     </property>
     <property
@@ -174,7 +175,7 @@
     </property>
     <property
         name="lessonCopy"
-        type="boolean"
+        type="java.lang.Boolean"
         column="lesson_copy_flag"
         not-null="true"
         length="4"
@@ -241,23 +242,9 @@
 
     <!-- Associations -->
   
-    <property 
-        name="userId" 
-        column="user_id" 
-        type="long"
-        length="20"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="user_id"
-            length="20"
-            not-null="true"
-        </meta> 
-    </property>
-    <!-- bi-directional one-to-many association to LamsLearningDesign -->
+    <!-- bi-directional one-to-many association to LearningDesign -->
     <set
-        name="lamsLearningDesigns"
+        name="learningDesigns"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -272,21 +259,18 @@
             column="parent_learning_design_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.learningdesign.LamsLearningDesign"
+            class="com.lamsinternational.lams.learningdesign.LearningDesign"
         </meta>
         <key>
             <column name="parent_learning_design_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.LamsLearningDesign"
+            class="com.lamsinternational.lams.learningdesign.LearningDesign"
         />
     </set>
-    
-    <many-to-one name="firstActivity" class="com.lamsinternational.lams.learningdesign.Activity" column="first_activity_id" unique="true"/>
-    
-    <!-- bi-directional many-to-one association to LamsLearningDesign -->
+    <!-- bi-directional many-to-one association to LearningDesign -->
     <many-to-one
-        name="parentLearningDesign"
+        name="learningDesign"
         class="com.lamsinternational.lams.learningdesign.LearningDesign"
         not-null="true"
     >
@@ -297,23 +281,8 @@
         </meta>
         <column name="parent_learning_design_id" />
     </many-to-one>
-    
+    <!-- bi-directional one-to-many association to Transition -->
     <set
-        name="childLearningDesigns"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <key>
-            <column name="parent_learning_design_id" />
-        </key>
-        <one-to-many 
-            class="com.lamsinternational.lams.learningdesign.LearningDesign"
-        />
-    </set>
-    
-    <!-- bi-directional one-to-many association to LamsLearningTransition -->
-    <set
         name="transitions"
         lazy="true"
         inverse="true"
@@ -338,7 +307,7 @@
             class="com.lamsinternational.lams.learningdesign.Transition"
         />
     </set>
-    <!-- bi-directional one-to-many association to LamsLearningActivity -->
+    <!-- bi-directional one-to-many association to Activity -->
     <set
         name="activities"
         lazy="true"
Index: lams_common/conf/hibernate/mappings/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u -r7be08bdc387f5f78514d44a89caab0ba1eea7655 -r75c68086ca1df84b98d4f53ca4e152071ceb8b06
--- lams_common/conf/hibernate/mappings/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 7be08bdc387f5f78514d44a89caab0ba1eea7655)
+++ lams_common/conf/hibernate/mappings/learningdesign/LearningLibrary.hbm.xml	(.../LearningLibrary.hbm.xml)	(revision 75c68086ca1df84b98d4f53ca4e152071ceb8b06)
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_learning_library"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="learningLibraryId"
@@ -31,6 +32,7 @@
             type="java.lang.Long"
             column="learning_library_id"
 
+
         </meta>
         <generator class="assigned" />
     </id>
@@ -76,7 +78,7 @@
 
     <!-- Associations -->
   
-    <!-- bi-directional one-to-many association to LamsLearningActivity -->
+    <!-- bi-directional one-to-many association to Activity -->
     <set
         name="activities"
         lazy="true"
Index: lams_common/conf/hibernate/mappings/learningdesign/Transition.hbm.xml
===================================================================
diff -u -r7be08bdc387f5f78514d44a89caab0ba1eea7655 -r75c68086ca1df84b98d4f53ca4e152071ceb8b06
--- lams_common/conf/hibernate/mappings/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 7be08bdc387f5f78514d44a89caab0ba1eea7655)
+++ lams_common/conf/hibernate/mappings/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 75c68086ca1df84b98d4f53ca4e152071ceb8b06)
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_learning_transition"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="transitionId"
@@ -31,6 +32,7 @@
             type="java.lang.Long"
             column="transition_id"
 
+
         </meta>
         <generator class="assigned" />
     </id>
@@ -88,44 +90,44 @@
 
     <!-- Associations -->
   
-    <!-- bi-directional many-to-one association to LamsLearningActivity -->
+    <!-- bi-directional many-to-one association to LearningDesign -->
     <many-to-one
-        name="toActivity"
-        class="com.lamsinternational.lams.learningdesign.LearningActivity"
+        name="learningDesign"
+        class="com.lamsinternational.lams.learningdesign.LearningDesign"
         not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="to_activity_id"         
+           @hibernate.column name="learning_design_id"         
         </meta>
-        <column name="to_activity_id" />
+        <column name="learning_design_id" />
     </many-to-one>
-    <!-- bi-directional many-to-one association to LamsLearningActivity -->
+    <!-- bi-directional many-to-one association to Activity -->
     <many-to-one
-        name="fromActivityId"
-        class="com.lamsinternational.lams.learningdesign.LearningActivity"
+        name="activityByToActivityId"
+        class="com.lamsinternational.lams.learningdesign.Activity"
         not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="from_activity_id"         
+           @hibernate.column name="to_activity_id"         
         </meta>
-        <column name="from_activity_id" />
+        <column name="to_activity_id" />
     </many-to-one>
-    <!-- bi-directional many-to-one association to LamsLearningDesign -->
+    <!-- bi-directional many-to-one association to Activity -->
     <many-to-one
-        name="learningDesign"
-        class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        name="activityByFromActivityId"
+        class="com.lamsinternational.lams.learningdesign.Activity"
         not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="learning_design_id"         
+           @hibernate.column name="from_activity_id"         
         </meta>
-        <column name="learning_design_id" />
+        <column name="from_activity_id" />
     </many-to-one>
 
 </class>