Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java
===================================================================
diff -u -rf1b668739b744f48d8f603f951ab0bd2ba310a0b -r572436e008d381df81e6826cefaa3f4ef4e04c7b
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java	(.../ExtCourseClassMap.java)	(revision f1b668739b744f48d8f603f951ab0bd2ba310a0b)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java	(.../ExtCourseClassMap.java)	(revision 572436e008d381df81e6826cefaa3f4ef4e04c7b)
@@ -84,7 +84,8 @@
     /** 
      *            @hibernate.many-to-one
      *             not-null="true"
-     *            @hibernate.column name="classid"         
+     *            @hibernate.column name="classid"
+     *             lazy="true"         
      *         
      */
     public Organisation getOrganisation() {
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java
===================================================================
diff -u -rf1b668739b744f48d8f603f951ab0bd2ba310a0b -r572436e008d381df81e6826cefaa3f4ef4e04c7b
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	(.../ExtServerOrgMap.java)	(revision f1b668739b744f48d8f603f951ab0bd2ba310a0b)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	(.../ExtServerOrgMap.java)	(revision 572436e008d381df81e6826cefaa3f4ef4e04c7b)
@@ -223,7 +223,8 @@
     /** 
      *            @hibernate.many-to-one
      *             not-null="true"
-     *            @hibernate.column name="orgid"         
+     *            @hibernate.column name="orgid"
+     *             lazy="true"         
      *         
      */
     public Organisation getOrganisation() {
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java
===================================================================
diff -u -r56322171d54c1a5b5711ba623f965db29d63dddd -r572436e008d381df81e6826cefaa3f4ef4e04c7b
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision 56322171d54c1a5b5711ba623f965db29d63dddd)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision 572436e008d381df81e6826cefaa3f4ef4e04c7b)
@@ -70,7 +70,8 @@
     /** 
      *            @hibernate.many-to-one
      *             not-null="true"
-     *            @hibernate.column name="user_id"         
+     *            @hibernate.column name="user_id"
+     *             lazy="true"         
      *         
      */
     public User getUser() {