Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
===================================================================
diff -u -r14d82446e40bfe1dfa32a2710cd5453da3261a37 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision 14d82446e40bfe1dfa32a2710cd5453da3261a37)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -73,10 +73,12 @@
         name="organisation"
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+	        lazy="false"
            @hibernate.column name="classid"         
         </meta>
         <column name="classid" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
diff -u -r14d82446e40bfe1dfa32a2710cd5453da3261a37 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 14d82446e40bfe1dfa32a2710cd5453da3261a37)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -214,11 +214,13 @@
         name="organisation"
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="orgid"         
+           	lazy="false"         
+           @hibernate.column name="orgid"
         </meta>
         <column name="orgid" />
     </many-to-one>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
===================================================================
diff -u -rfff8becbb55843023f38d6bcc63de06d72f38283 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision fff8becbb55843023f38d6bcc63de06d72f38283)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -60,10 +60,12 @@
         name="user"
         class="org.lamsfoundation.lams.usermanagement.User"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+           	lazy="false"
            @hibernate.column name="user_id"         
         </meta>
         <column name="user_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -rdeb9d1788200c63a76975540de43862e59449503 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision deb9d1788200c63a76975540de43862e59449503)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -173,10 +173,12 @@
         name="organisationState"
         class="org.lamsfoundation.lams.usermanagement.OrganisationState"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+        	lazy="false"
            @hibernate.column name="organisation_state_id"         
         </meta>
         <column name="organisation_state_id" />
@@ -187,12 +189,14 @@
         name="workspace"
         class="org.lamsfoundation.lams.usermanagement.Workspace"
         cascade="all"
+        lazy = "false"
         not-null="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
 			cascade="all"
             not-null="false"
+            lazy="false"
            @hibernate.column name="workspace_id"         
         </meta>
         <column name="workspace_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r6b897d09ff384d8842aee28ded8ebe6a1f5857d8 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 6b897d09ff384d8842aee28ded8ebe6a1f5857d8)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -299,11 +299,13 @@
     <many-to-one
         name="workspace"
         cascade="all"
+        lazy="false"
         class="org.lamsfoundation.lams.usermanagement.Workspace"     
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
 	         cascade="all"
+	         lazy="false"
            @hibernate.column name="workspace_id"         
         </meta>
         <column name="workspace_id" />
@@ -312,11 +314,13 @@
     <set
         name="userOrganisations"
         inverse="true"
+        lazy="false"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
             inverse="true"
+            lazy="false"
             cascade="all-delete-orphan"
 
            @hibernate.collection-key
@@ -326,8 +330,6 @@
             class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
         </meta>
         
-        <cache usage="transactional" />
-
         <key>
             <column name="user_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -rcadb456a32c5e95823f3472fd99a0b17c52b9218 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -60,11 +60,13 @@
     <set
         name="userOrganisationRoles"
         inverse="true"
+        lazy = "false"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
             inverse="true"
+            lazy = "false"
             cascade="all-delete-orphan"
 
            @hibernate.collection-key
@@ -74,8 +76,6 @@
             class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole"
         </meta>
         
-        <cache usage="transactional" />
-        
         <key>
             <column name="user_organisation_id" />
         </key>
@@ -88,11 +88,13 @@
         name="organisation"
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+	        lazy="false"
            @hibernate.column name="organisation_id"         
         </meta>
         <column name="organisation_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml
===================================================================
diff -u -rcadb456a32c5e95823f3472fd99a0b17c52b9218 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -61,11 +61,13 @@
         name="role"
         class="org.lamsfoundation.lams.usermanagement.Role"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+            lazy="false"
            @hibernate.column name="role_id"         
         </meta>
         <column name="role_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -ra07f122478a2eb187e7448fbfe41a738504e3f26 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision a07f122478a2eb187e7448fbfe41a738504e3f26)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
@@ -80,13 +80,13 @@
     <!-- bi-directional one-to-many association to WorkspaceFolder -->
     <set
         name="childWorkspaceFolders"
-        lazy="true"
+        lazy="false"
         inverse="true"
 		cascade="none"
     >
         <meta attribute="field-description">
            @hibernate.set
-            lazy="true"
+            lazy="false"
             inverse="true"
             cascade="none"