Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
===================================================================
diff -u -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -73,12 +73,10 @@
         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 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -214,13 +214,11 @@
         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="orgid"
+           @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 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -60,12 +60,10 @@
         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 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -173,12 +173,10 @@
         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" />
@@ -189,14 +187,12 @@
         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 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -299,13 +299,11 @@
     <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" />
@@ -314,13 +312,11 @@
     <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
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -60,13 +60,11 @@
     <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
@@ -88,13 +86,11 @@
         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 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -61,13 +61,11 @@
         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 -r269c9e6effb03a516d429c1c2a0a9aaf7ac618bd -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 269c9e6effb03a516d429c1c2a0a9aaf7ac618bd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb)
@@ -80,13 +80,13 @@
     <!-- bi-directional one-to-many association to WorkspaceFolder -->
     <set
         name="childWorkspaceFolders"
-        lazy="false"
+        lazy="true"
         inverse="true"
 		cascade="none"
     >
         <meta attribute="field-description">
            @hibernate.set
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="none"
 
@@ -126,7 +126,7 @@
     </set>
     
     <!-- bi-directional one-to-many association to WorkspaceFolderContent -->
-    <set name="folderContent" lazy="false" inverse="true" cascade="delete">
+    <set name="folderContent" lazy="true" inverse="true" cascade="delete">
         <key><column name="workspace_folder_id" /></key>
         <one-to-many class="org.lamsfoundation.lams.workspace.WorkspaceFolderContent"/>
     </set>