Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
===================================================================
diff -u -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab -r16c006013f462682150f9291afd7d88885998706
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml	(.../Event.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml	(.../Event.hbm.xml)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -80,7 +80,6 @@
 
         <set
             name="subscriptions"
-            lazy="false"
             cascade="all-delete-orphan"
             sort="unsorted"
             fetch="join"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab -r16c006013f462682150f9291afd7d88885998706
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -196,7 +196,7 @@
                  	<column name="system_tool_id" not-null="false"/>
                  </many-to-one>                 
 
-				<property name="createGroupingUIID" type="java.lang.Integer" column="create_grouping_ui_id" length="11" lazy="false">
+				<property name="createGroupingUIID" type="java.lang.Integer" column="create_grouping_ui_id" length="11">
 				            
 				</property>
 								
@@ -259,6 +259,9 @@
 	    
 	    <!-- bi-directional one-to-many association to Activity. Don't use all-delete-orphan as the child activity may be removed -->
 	    <!-- from this relationship but not from the database (e.g. moving from an optional activity to the main level in the design -->
+	    <!-- Having it non-lazy might be the best idea. It is often iterated in non-transaction methods (Actions),
+	         so we would have to write code to fetch the collection contents anyway. 
+	    	 Also it is cached and pretty much immutable, so it should not hit the DB very often.  -->
 	    <set name="activities" lazy="false" inverse="true" cascade="save-update" sort="org.lamsfoundation.lams.learningdesign.ActivityOrderComparator" >
     <cache usage="transactional" />
 
@@ -312,7 +315,7 @@
 				
 
                  <!-- uni-directional many-to-one association to System Tool -->
-                 <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
+                 <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool">
                  	<column name="system_tool_id" not-null="false"/>
                  </many-to-one>                 
 
@@ -332,7 +335,7 @@
 							
 	  						
 	             <!-- uni-directional many-to-one association to System Tool -->
-	             <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
+	             <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" >
 	             	<column name="system_tool_id" not-null="false"/>
 	             </many-to-one>
 
@@ -368,13 +371,11 @@
 				</property>
 				
                 <!-- uni-directional many-to-one association to System Tool -->
-                <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
+                <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" >
                 	<column name="system_tool_id" not-null="false"/>
                 </many-to-one>                    
 		 	</subclass>	
 	</subclass>
 
 </class>
-</hibernate-mapping>
-
-    
+</hibernate-mapping>
\ No newline at end of file
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
===================================================================
diff -u -r64b01b16c79948bf1fbb2ee012055cb2611c0187 -r16c006013f462682150f9291afd7d88885998706
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml	(.../BranchCondition.hbm.xml)	(revision 64b01b16c79948bf1fbb2ee012055cb2611c0187)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml	(.../BranchCondition.hbm.xml)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -53,6 +53,8 @@
             
     </property>
     
+        <!-- Since this is just one element and it is often used in non-transactional methods (Actions),
+    	 it should probably stay non-lazy -->
      <joined-subclass  name="org.lamsfoundation.lams.learningdesign.TextSearchCondition" table="lams_text_search_condition" lazy="false">
      	
      	
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
===================================================================
diff -u -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab -r16c006013f462682150f9291afd7d88885998706
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml	(.../ToolContent.hbm.xml)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -32,7 +32,6 @@
 	<many-to-one name="tool"
 			class="org.lamsfoundation.lams.tool.Tool"
 			not-null="true" 
-			lazy="false"
 			cascade="none">
 			<column name="tool_id" />
 	</many-to-one>
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab -r16c006013f462682150f9291afd7d88885998706
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -136,7 +136,6 @@
         <set
             name="attachments"
             table="ATTACHMENT"
-            lazy="false"
             inverse="false"
             cascade="all-delete-orphan"
             sort="unsorted"
@@ -201,7 +200,6 @@
 
         <set
             name="sessionClones"
-            lazy="false"
             inverse="false"
             cascade="none"
             sort="unsorted"
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
===================================================================
diff -u -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab -r16c006013f462682150f9291afd7d88885998706
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -130,7 +130,6 @@
 
         <set
             name="gmapMarkers"
-            lazy="false"
             cascade="all-delete-orphan"
             sort="unsorted"
         >
Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
===================================================================
diff -u -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab -r16c006013f462682150f9291afd7d88885998706
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml	(.../CommonCartridgeItem.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml	(.../CommonCartridgeItem.hbm.xml)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -68,28 +68,6 @@
             column="init_item"
         />
 
-        <set
-            name="itemInstructions"
-            lazy="false"
-            inverse="false"
-            cascade="all-delete-orphan"
-            sort="unsorted"
-            order-by="sequence_id asc"
-        >
-    <cache usage="transactional" />
-
-
-            <key
-                column="item_uid"
-            >
-            </key>
-
-            <one-to-many
-                  class="org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItemInstruction"
-            />
-
-        </set>
-
         <property
             name="organizationXml"
             type="java.lang.String"
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
===================================================================
diff -u -r2bef59c032438311b6dfadac874b0a7ee4cb72de -r16c006013f462682150f9291afd7d88885998706
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java	(.../CommonCartridgeItem.java)	(revision 2bef59c032438311b6dfadac874b0a7ee4cb72de)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java	(.../CommonCartridgeItem.java)	(revision 16c006013f462682150f9291afd7d88885998706)
@@ -24,9 +24,6 @@
 package org.lamsfoundation.lams.tool.commonCartridge.model;
 
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
 
 import org.apache.log4j.Logger;
 
@@ -71,8 +68,6 @@
 
     private String fileType;
 
-    private Set itemInstructions;
-
     private boolean isHide;
     private boolean isCreateByAuthor;
 
@@ -88,17 +83,6 @@
 	CommonCartridgeItem obj = null;
 	try {
 	    obj = (CommonCartridgeItem) super.clone();
-	    // clone attachment
-	    if (itemInstructions != null) {
-		Iterator iter = itemInstructions.iterator();
-		Set set = new HashSet();
-		while (iter.hasNext()) {
-		    CommonCartridgeItemInstruction instruct = (CommonCartridgeItemInstruction) iter.next();
-		    CommonCartridgeItemInstruction newInsruct = (CommonCartridgeItemInstruction) instruct.clone();
-		    set.add(newInsruct);
-		}
-		obj.itemInstructions = set;
-	    }
 	    obj.setUid(null);
 	    // clone ReourceUser as well
 	    if (this.createBy != null) {
@@ -194,23 +178,8 @@
 
     /**
      *
-     *
-     *
-     *
      * @return
      */
-    public Set getItemInstructions() {
-	return itemInstructions;
-    }
-
-    public void setItemInstructions(Set itemInstructions) {
-	this.itemInstructions = itemInstructions;
-    }
-
-    /**
-     *
-     * @return
-     */
     public String getOrganizationXml() {
 	return organizationXml;
     }