Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -rbe98be3a54b24a8a4539bbdc2eb2027ed617a23d -r9f48c29afb605fbf7a9e0f6f20402b80639b071f
--- lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision be98be3a54b24a8a4539bbdc2eb2027ed617a23d)
+++ lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision 9f48c29afb605fbf7a9e0f6f20402b80639b071f)
@@ -326,8 +326,8 @@
 <column name="learning_design_id" alias="" remarks="" mandatory="false" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
 <data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
 <variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
 <variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
 <variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
 <variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
@@ -339,8 +339,8 @@
 <column name="learning_library_id" alias="" remarks="" mandatory="false" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
 <data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
 <variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
 <variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
 <variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
 <variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
@@ -416,8 +416,8 @@
 <column name="gate_activity_level_id" alias="" remarks="" mandatory="false" column-size="11" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
 <data-type name="INT" jdbc-type="4" selected-variant-pattern="INT(%n)">
-<variant type-name-pattern="INT"/>
 <variant type-name-pattern="INT(%n)" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT"/>
 <variant type-name-pattern="INT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="10"/>
 <variant type-name-pattern="INT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
 <variant type-name-pattern="INT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
@@ -458,6 +458,19 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column name="library_activity_id" alias="" remarks="" mandatory="false" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT"/>
+<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key name="PRIMARY" alias="" remarks="">
 <primary-key-description/>
@@ -521,6 +534,13 @@
 </foreign-key-figure>
 <foreign-key-column column-name="create_grouping_id" referenced-key-column-name="grouping_id"/>
 </foreign-key>
+<foreign-key name="FK_lams_learning_activity_11" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learning_activity" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="library_activity_id" referenced-key-column-name="activity_id"/>
+</foreign-key>
 </foreign-key-list>
 <index-list>
 <index name="PRIMARY" alias="" remarks="" unique="true">
@@ -2365,8 +2385,21 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="group_id" alias="" remarks="" mandatory="false" column-size="20" decimal-digits="0" default-value="0" auto-increment="false">
+<column name="tool_session_type_id" alias="" remarks="" mandatory="true" column-size="3" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
+<data-type name="INT" jdbc-type="4" selected-variant-pattern="INT(%n)">
+<variant type-name-pattern="INT(%n)" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT"/>
+<variant type-name-pattern="INT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT UNSIGNED"/>
+<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INT ZEROFILL"/>
+</data-type>
+</column>
+<column name="lesson_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
 <data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
 <variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
 <variant type-name-pattern="BIGINT"/>
@@ -2423,35 +2456,7 @@
 <variant type-name-pattern="DATETIME"/>
 </data-type>
 </column>
-</column-list>
-<primary-key name="PK_LAMS_TOOL_SESSION" alias="" remarks="">
-<primary-key-description/>
-<primary-key-column name="tool_session_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key name="FK_lams_tool_session_1" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_group" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
-<foreign-key-description/>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="group_id" referenced-key-column-name="group_id"/>
-</foreign-key>
-<foreign-key name="FK_lams_tool_session_4" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_tool_session_state" referenced-key="PK_LAMS_TOOL_SESSION_STATE" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
-<foreign-key-description/>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="tool_session_state_id" referenced-key-column-name="tool_session_state_id"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table name="lams_progress_completed" alias="" remarks="">
-<table-description/>
-<table-figure-bounds x="1034" y="977" width="-1" height="-1"/>
-<column-list>
-<column name="learner_progress_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column name="group_id" alias="" remarks="" mandatory="false" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
 <data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
 <variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
@@ -2464,7 +2469,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="activity_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="0" auto-increment="false">
+<column name="user_id" alias="" remarks="" mandatory="false" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
 <data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
 <variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
@@ -2477,34 +2482,80 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column name="unique_key" alias="" remarks="" mandatory="true" column-size="128" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
+<variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
+<variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
+</data-type>
+</column>
 </column-list>
-<primary-key name="PK_LAMS_PROGRESS_COMPLETED" alias="" remarks="">
+<primary-key name="PK_LAMS_TOOL_SESSION" alias="" remarks="">
 <primary-key-description/>
-<primary-key-column name="learner_progress_id"/>
-<primary-key-column name="activity_id"/>
+<primary-key-column name="tool_session_id"/>
 </primary-key>
-<unique-key-list/>
+<unique-key-list>
+<unique-key name="UQ_lams_tool_session_1" alias="" remarks="">
+<unique-key-description/>
+<unique-key-column name="unique_key"/>
+</unique-key>
+</unique-key-list>
 <foreign-key-list>
-<foreign-key name="FK_lams_progress_completed_1" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learner_progress" referenced-key="PK_LAMS_LEARNER_PROGRESS" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key name="FK_lams_tool_session_1" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_group" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
 <foreign-key-description/>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="learner_progress_id" referenced-key-column-name="learner_progress_id"/>
+<foreign-key-column column-name="group_id" referenced-key-column-name="group_id"/>
 </foreign-key>
-<foreign-key name="FK_lams_progress_completed_2" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learning_activity" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key name="FK_lams_tool_session_4" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_tool_session_state" referenced-key="PK_LAMS_TOOL_SESSION_STATE" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
 <foreign-key-description/>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
+<foreign-key-column column-name="tool_session_state_id" referenced-key-column-name="tool_session_state_id"/>
+</foreign-key>
+<foreign-key name="FK_lams_tool_session_3" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_group" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="group_id" referenced-key-column-name="group_id"/>
+</foreign-key>
+<foreign-key name="FK_lams_tool_session_5" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_user" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="user_id" referenced-key-column-name="user_id"/>
+</foreign-key>
+<foreign-key name="FK_lams_tool_session_6" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_lesson" referenced-key="PK_LAMS_LESSON" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="lesson_id" referenced-key-column-name="lesson_id"/>
+</foreign-key>
+<foreign-key name="FK_lams_tool_session_7" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_tool_session_type" referenced-key="PK_LAMS_TOOL_SESSION_TYPE" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="tool_session_type_id" referenced-key-column-name="tool_session_type_id"/>
+</foreign-key>
+<foreign-key name="FK_lams_tool_session_8" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learning_activity" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
 <foreign-key-column column-name="activity_id" referenced-key-column-name="activity_id"/>
 </foreign-key>
 </foreign-key-list>
 <index-list/>
 </table>
-<table name="lams_progress_attempted" alias="" remarks="">
+<table name="lams_progress_completed" alias="" remarks="">
 <table-description/>
-<table-figure-bounds x="1327" y="979" width="-1" height="-1"/>
+<table-figure-bounds x="1034" y="977" width="-1" height="-1"/>
 <column-list>
 <column name="learner_progress_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
@@ -2533,21 +2584,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key name="PK_LAMS_PROGRESS_ATTEMPTED" alias="" remarks="">
+<primary-key name="PK_LAMS_PROGRESS_COMPLETED" alias="" remarks="">
 <primary-key-description/>
 <primary-key-column name="learner_progress_id"/>
 <primary-key-column name="activity_id"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key name="FK_lams_progress_current_1" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learner_progress" referenced-key="PK_LAMS_LEARNER_PROGRESS" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key name="FK_lams_progress_completed_1" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learner_progress" referenced-key="PK_LAMS_LEARNER_PROGRESS" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
 <foreign-key-description/>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="learner_progress_id" referenced-key-column-name="learner_progress_id"/>
 </foreign-key>
-<foreign-key name="FK_lams_progress_current_2" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learning_activity" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key name="FK_lams_progress_completed_2" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learning_activity" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
 <foreign-key-description/>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2557,11 +2608,11 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table name="lams_user_tool_session" alias="" remarks="">
+<table name="lams_progress_attempted" alias="" remarks="">
 <table-description/>
-<table-figure-bounds x="751" y="1723" width="-1" height="-1"/>
+<table-figure-bounds x="1327" y="979" width="-1" height="-1"/>
 <column-list>
-<column name="tool_session_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column name="learner_progress_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
 <data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
 <variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
@@ -2574,7 +2625,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="user_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="0" auto-increment="false">
+<column name="activity_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="0" auto-increment="false">
 <column-description/>
 <data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
 <variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
@@ -2587,54 +2638,34 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="user_tool_session_state_id" alias="" remarks="" mandatory="true" column-size="3" decimal-digits="0" default-value="" auto-increment="false">
-<column-description/>
-<data-type name="INT" jdbc-type="4" selected-variant-pattern="INT(%n)">
-<variant type-name-pattern="INT(%n)" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT"/>
-<variant type-name-pattern="INT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT UNSIGNED"/>
-<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INT ZEROFILL"/>
-</data-type>
-</column>
 </column-list>
-<primary-key name="PK_LAMS_USER_TOOL_SESSION" alias="" remarks="">
+<primary-key name="PK_LAMS_PROGRESS_ATTEMPTED" alias="" remarks="">
 <primary-key-description/>
-<primary-key-column name="tool_session_id"/>
-<primary-key-column name="user_id"/>
+<primary-key-column name="learner_progress_id"/>
+<primary-key-column name="activity_id"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key name="FK_lams_user_tool_session_1" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_tool_session" referenced-key="PK_LAMS_TOOL_SESSION" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key name="FK_lams_progress_current_1" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learner_progress" referenced-key="PK_LAMS_LEARNER_PROGRESS" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
 <foreign-key-description/>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="tool_session_id" referenced-key-column-name="tool_session_id"/>
+<foreign-key-column column-name="learner_progress_id" referenced-key-column-name="learner_progress_id"/>
 </foreign-key>
-<foreign-key name="FK_lams_user_tool_session_2" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_user" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key name="FK_lams_progress_current_2" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learning_activity" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
 <foreign-key-description/>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="user_id" referenced-key-column-name="user_id"/>
+<foreign-key-column column-name="activity_id" referenced-key-column-name="activity_id"/>
 </foreign-key>
-<foreign-key name="FK_lams_user_tool_session_3" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_user_tool_session_state" referenced-key="PK_LAMS_USER_TOOL_SESSION_STATE" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
-<foreign-key-description/>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="user_tool_session_state_id" referenced-key-column-name="user_tool_session_state_id"/>
-</foreign-key>
 </foreign-key-list>
 <index-list/>
 </table>
 <table name="lams_tool_session_state" alias="" remarks="">
 <table-description/>
-<table-figure-bounds x="1205" y="1891" width="-1" height="-1"/>
+<table-figure-bounds x="1201" y="1916" width="-1" height="-1"/>
 <column-list>
 <column name="tool_session_state_id" alias="" remarks="" mandatory="true" column-size="3" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
@@ -2665,39 +2696,6 @@
 <foreign-key-list/>
 <index-list/>
 </table>
-<table name="lams_user_tool_session_state" alias="" remarks="">
-<table-description/>
-<table-figure-bounds x="469" y="1710" width="-1" height="-1"/>
-<column-list>
-<column name="user_tool_session_state_id" alias="" remarks="" mandatory="true" column-size="3" decimal-digits="0" default-value="" auto-increment="false">
-<column-description/>
-<data-type name="INT" jdbc-type="4" selected-variant-pattern="INT(%n)">
-<variant type-name-pattern="INT(%n)" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT"/>
-<variant type-name-pattern="INT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
-<variant type-name-pattern="INT UNSIGNED"/>
-<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INT ZEROFILL"/>
-</data-type>
-</column>
-<column name="description" alias="" remarks="" mandatory="true" column-size="255" decimal-digits="0" default-value="" auto-increment="false">
-<column-description/>
-<data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
-<variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
-<variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
-</data-type>
-</column>
-</column-list>
-<primary-key name="PK_LAMS_USER_TOOL_SESSION_STATE" alias="" remarks="">
-<primary-key-description/>
-<primary-key-column name="user_tool_session_state_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list/>
-</table>
 <table name="lams_user_group" alias="" remarks="">
 <table-description/>
 <table-figure-bounds x="628" y="716" width="-1" height="-1"/>
@@ -2939,6 +2937,39 @@
 </foreign-key-list>
 <index-list/>
 </table>
+<table name="lams_tool_session_type" alias="" remarks="">
+<table-description/>
+<table-figure-bounds x="478" y="1710" width="-1" height="-1"/>
+<column-list>
+<column name="tool_session_type_id" alias="" remarks="" mandatory="true" column-size="3" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="INT" jdbc-type="4" selected-variant-pattern="INT(%n)">
+<variant type-name-pattern="INT(%n)" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT"/>
+<variant type-name-pattern="INT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="10"/>
+<variant type-name-pattern="INT UNSIGNED"/>
+<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INT ZEROFILL"/>
+</data-type>
+</column>
+<column name="description" alias="" remarks="" mandatory="true" column-size="255" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
+<variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
+<variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
+</data-type>
+</column>
+</column-list>
+<primary-key name="PK_LAMS_TOOL_SESSION_TYPE" alias="" remarks="">
+<primary-key-description/>
+<primary-key-column name="tool_session_type_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list/>
+<index-list/>
+</table>
 </table-list>
 </schema>
 </schema-list>