Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r59b27599f604a167e6b79f2b9af6e0942fa551f2 -r8cac732bffc10bdc8ae29629fda9008d0c1d68a0
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 59b27599f604a167e6b79f2b9af6e0942fa551f2)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 8cac732bffc10bdc8ae29629fda9008d0c1d68a0)
@@ -134,11 +134,13 @@
     <many-to-one
         name="workspace"
         class="org.lamsfoundation.lams.usermanagement.Workspace"
-        not-null="true"
+        cascade="all"
+        not-null="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
-            not-null="true"
+			cascade="all"
+            not-null="false"
            @hibernate.column name="workspace_id"         
         </meta>
         <column name="workspace_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml
===================================================================
diff -u -r6633f5d5c7844c27582a9b323fead87fac99dfd5 -r8cac732bffc10bdc8ae29629fda9008d0c1d68a0
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision 6633f5d5c7844c27582a9b323fead87fac99dfd5)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision 8cac732bffc10bdc8ae29629fda9008d0c1d68a0)
@@ -102,14 +102,12 @@
         name="rootFolder"
         class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder"
         not-null="true"
-        cascade="all"
         lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
 	        lazy="false"
-	        cascade="all"
            @hibernate.column name="root_folder_id"         
         </meta>
         <column name="root_folder_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -r01a4035d52575ebe0a8467b4e589998196353962 -r8cac732bffc10bdc8ae29629fda9008d0c1d68a0
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 01a4035d52575ebe0a8467b4e589998196353962)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 8cac732bffc10bdc8ae29629fda9008d0c1d68a0)
@@ -84,7 +84,7 @@
   
     <!-- bi-directional one-to-many association to Workspace -->
     <set
-        name="workspaces"
+        name="workspacesByRootFolder"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -108,6 +108,32 @@
             class="org.lamsfoundation.lams.usermanagement.Workspace"
         />
     </set>
+    <!-- bi-directional one-to-many association to Workspace -->
+    <set
+        name="workspacesBySequenceFolder"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="def_run_seq_fld_id"
+
+           @hibernate.collection-one-to-many
+            class="org.lamsfoundation.lams.usermanagement.Workspace"
+        </meta>
+        <key>
+            <column name="def_run_seq_fld_id" />
+        </key>
+        <one-to-many 
+            class="org.lamsfoundation.lams.usermanagement.Workspace"
+        />
+    </set>
     <!-- bi-directional one-to-many association to WorkspaceFolder -->
     <set
         name="childWorkspaceFolders"
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
diff -u -r59585f425aab724cc98ca55c2b40ad3f2197e421 -r8cac732bffc10bdc8ae29629fda9008d0c1d68a0
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 59585f425aab724cc98ca55c2b40ad3f2197e421)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 8cac732bffc10bdc8ae29629fda9008d0c1d68a0)
@@ -201,7 +201,8 @@
 
     /** 
      *            @hibernate.many-to-one
-     *             not-null="true"
+     *             cascade="all"
+     *             not-null="false"
      *            @hibernate.column name="workspace_id"         
      *         
      */
@@ -216,7 +217,6 @@
     /** 
      *            @hibernate.many-to-one
      *             not-null="true"
-     *            @hibernate.column name="organisation_type_id"         
      *         
      */
     public OrganisationType getOrganisationType() {
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java
===================================================================
diff -u -r6633f5d5c7844c27582a9b323fead87fac99dfd5 -r8cac732bffc10bdc8ae29629fda9008d0c1d68a0
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java	(.../Workspace.java)	(revision 6633f5d5c7844c27582a9b323fead87fac99dfd5)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java	(.../Workspace.java)	(revision 8cac732bffc10bdc8ae29629fda9008d0c1d68a0)
@@ -91,7 +91,6 @@
      *            @hibernate.many-to-one
      *             not-null="true"
      *			   lazy="false"
-     *             cascade="all"
      *            @hibernate.column name="root_folder_id"         
      *         
      */
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java
===================================================================
diff -u -rdf6deaa8ac6cd72359c5436608ab66b1b87529e0 -r8cac732bffc10bdc8ae29629fda9008d0c1d68a0
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	(.../WorkspaceFolder.java)	(revision df6deaa8ac6cd72359c5436608ab66b1b87529e0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	(.../WorkspaceFolder.java)	(revision 8cac732bffc10bdc8ae29629fda9008d0c1d68a0)
@@ -68,9 +68,12 @@
     private WorkspaceFolder parentWorkspaceFolder;
 
     /** persistent field */
-    private Set workspaces;
+    private Set workspacesByRootFolder;
 
     /** persistent field */
+    private Set workspacesBySequenceFolder;
+
+    /** persistent field */
     private Set childWorkspaceFolders;
     
     private Set learningDesigns;
@@ -143,10 +146,10 @@
 		this.learningDesigns = learningDesigns;
 	}
     /** full constructor */
-    public WorkspaceFolder(String name, WorkspaceFolder parentWorkspaceFolder, Set workspaces, Set childWorkspaceFolders) {
+    public WorkspaceFolder(String name, WorkspaceFolder parentWorkspaceFolder, Set workspacesByRootFolder, Set childWorkspaceFolders) {
         this.name = name;    
         this.parentWorkspaceFolder = parentWorkspaceFolder;
-        this.workspaces = workspaces;
+        this.workspacesByRootFolder = workspacesByRootFolder;
         this.childWorkspaceFolders = childWorkspaceFolders;
     }
 
@@ -207,12 +210,12 @@
      *             class="org.lamsfoundation.lams.usermanagement.Workspace"
      *         
      */
-    public Set getWorkspaces() {
-        return this.workspaces;
+    public Set getWorkspacesByRootFolder() {
+        return this.workspacesByRootFolder;
     }
 
-    public void setWorkspaces(Set workspaces) {
-        this.workspaces = workspaces;
+    public void setWorkspacesByRootFolder(Set workspacesByRootFolder) {
+        this.workspacesByRootFolder = workspacesByRootFolder;
     }
 
     /** 
@@ -221,6 +224,25 @@
      *             inverse="true"
      *             cascade="none"
      *            @hibernate.collection-key
+     *             column="def_run_seq_fld_id"
+     *            @hibernate.collection-one-to-many
+     *             class="org.lamsfoundation.lams.usermanagement.Workspace"
+     *         
+     */
+    public Set getWorkspacesBySequenceFolder() {
+		return workspacesBySequenceFolder;
+	}
+
+	public void setWorkspacesBySequenceFolder(Set workspacesBySequenceFolder) {
+		this.workspacesBySequenceFolder = workspacesBySequenceFolder;
+	}
+
+	/** 
+     *            @hibernate.set
+     *             lazy="true"
+     *             inverse="true"
+     *             cascade="none"
+     *            @hibernate.collection-key
      *             column="parent_folder_id"
      *            @hibernate.collection-one-to-many
      *             class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder"