Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r3243ccb499dce210aa4990de05e97846a24c0df6
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 3243ccb499dce210aa4990de05e97846a24c0df6)
@@ -14,7 +14,6 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.Organisation" 
     table="lams_organisation"
-    proxy="com.lamsinternational.lams.usermanagement.Organisation"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
@@ -147,13 +146,13 @@
             cascade="none"
 
            @hibernate.collection-key
-            column="parent_folder_id"
+            column="parent_organisation_id"
 
            @hibernate.collection-one-to-many
             class="com.lamsinternational.lams.usermanagement.Organisation"
         </meta>
         <key>
-            <column name="parent_folder_id" />
+            <column name="parent_organisation_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.usermanagement.Organisation"
@@ -166,9 +165,9 @@
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
-           @hibernate.column name="parent_folder_id"         
+           @hibernate.column name="parent_organisation_id"         
         </meta>
-        <column name="parent_folder_id" />
+        <column name="parent_organisation_id" />
     </many-to-one>
     <!-- bi-directional one-to-many association to User -->
     <set
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r3243ccb499dce210aa4990de05e97846a24c0df6
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 3243ccb499dce210aa4990de05e97846a24c0df6)
@@ -14,7 +14,6 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.Role" 
     table="lams_role"
-    proxy="com.lamsinternational.lams.usermanagement.Role"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r3243ccb499dce210aa4990de05e97846a24c0df6
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 3243ccb499dce210aa4990de05e97846a24c0df6)
@@ -14,7 +14,6 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.UserOrganisation" 
     table="lams_user_organisation"
-    proxy="com.lamsinternational.lams.usermanagement.UserOrganisation"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
@@ -59,13 +58,13 @@
     <!-- bi-directional one-to-many association to UserOrganisationRole -->
     <set
         name="userOrganisationRoles"
-        lazy="true"
+        lazy="false"
         inverse="true"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
-            lazy="true"
+            lazy="false"
             inverse="true"
             cascade="all-delete-orphan"