Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r9c15c8b034d6d3699e32ebfb62cfd8f012aeea15 -rbf3d839b523336d9b97a1b135a358d898605d6be
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 9c15c8b034d6d3699e32ebfb62cfd8f012aeea15)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision bf3d839b523336d9b97a1b135a358d898605d6be)
@@ -66,11 +66,11 @@
      , PRIMARY KEY (tool_session_state_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams_user_tool_session_state (
-       user_tool_session_state_id INT(3) NOT NULL
-     , description VARCHAR(255) NOT NULL
-     , PRIMARY KEY (user_tool_session_state_id)
-)TYPE=InnoDB;
+--CREATE TABLE lams_user_tool_session_state (
+--       user_tool_session_state_id INT(3) NOT NULL
+--     , description VARCHAR(255) NOT NULL
+--     , PRIMARY KEY (user_tool_session_state_id)
+--)TYPE=InnoDB;
 
 CREATE TABLE lams_lesson_state (
        lesson_state_id INT(3) NOT NULL
@@ -345,17 +345,31 @@
                   REFERENCES lams_learning_activity (activity_id) 
 )TYPE=InnoDB;
 
+CREATE TABLE lams_tool_session_type (
+       tool_session_type_id INT(11) NOT NULL DEFAULT 0
+     , description VARCHAR(128) NOT NULL
+     , PRIMARY KEY (tool_session_type_id)
+)TYPE=InnoDB;
+
 CREATE TABLE lams_tool_session (
        tool_session_id BIGINT(20) NOT NULL AUTO_INCREMENT
-     , group_id BIGINT(20) DEFAULT 0
+     , tool_session_type_id INT(11) NOT NULL
+     , group_id BIGINT(20)
+     , user_id BIGINT(20)
      , activity_id BIGINT(20) NOT NULL
      , tool_session_key BIGINT(20) NOT NULL
      , tool_session_state_id INT(3) NOT NULL
      , create_date_time DATETIME NOT NULL
      , PRIMARY KEY (tool_session_id)
+     , INDEX (tool_session_type_id) 
+     , CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (tool_session_type_id) 
+                  REFERENCES lams_tool_session_type (tool_session_type_id) 
      , INDEX (group_id)
-     , CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (group_id)
+     , CONSTRAINT FK_lams_tool_session_2 FOREIGN KEY (group_id)
                   REFERENCES lams_group (group_id)
+     , INDEX (user_id)
+     , CONSTRAINT FK_lams_tool_session_3 FOREIGN KEY (user_id)
+                  REFERENCES lams_user (user_id)
      , INDEX (tool_session_state_id)
      , CONSTRAINT FK_lams_tool_session_4 FOREIGN KEY (tool_session_state_id)
                   REFERENCES lams_tool_session_state (tool_session_state_id)
@@ -398,21 +412,21 @@
                   REFERENCES lams_learning_activity (activity_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams_user_tool_session (
-       tool_session_id BIGINT(20) NOT NULL
-     , user_id BIGINT(20) NOT NULL DEFAULT 0
-     , user_tool_session_state_id INT(3) NOT NULL
-     , PRIMARY KEY (tool_session_id, user_id)
-     , INDEX (tool_session_id)
-     , CONSTRAINT FK_lams_user_tool_session_1 FOREIGN KEY (tool_session_id)
-                  REFERENCES lams_tool_session (tool_session_id)
-     , INDEX (user_id)
-     , CONSTRAINT FK_lams_user_tool_session_2 FOREIGN KEY (user_id)
-                  REFERENCES lams_user (user_id)
-     , INDEX (user_tool_session_state_id)
-     , CONSTRAINT FK_lams_user_tool_session_3 FOREIGN KEY (user_tool_session_state_id)
-                  REFERENCES lams_user_tool_session_state (user_tool_session_state_id)
-)TYPE=InnoDB;
+--CREATE TABLE lams_user_tool_session (
+--       tool_session_id BIGINT(20) NOT NULL
+--     , user_id BIGINT(20) NOT NULL DEFAULT 0
+--     , user_tool_session_state_id INT(3) NOT NULL
+--     , PRIMARY KEY (tool_session_id, user_id)
+--     , INDEX (tool_session_id)
+--     , CONSTRAINT FK_lams_user_tool_session_1 FOREIGN KEY (tool_session_id)
+--                  REFERENCES lams_tool_session (tool_session_id)
+--     , INDEX (user_id)
+--     , CONSTRAINT FK_lams_user_tool_session_2 FOREIGN KEY (user_id)
+--                  REFERENCES lams_user (user_id)
+--     , INDEX (user_tool_session_state_id)
+--     , CONSTRAINT FK_lams_user_tool_session_3 FOREIGN KEY (user_tool_session_state_id)
+--                  REFERENCES lams_user_tool_session_state (user_tool_session_state_id)
+--)TYPE=InnoDB;
 
 CREATE TABLE lams_user_group (
        user_id BIGINT(20) NOT NULL DEFAULT 0
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
diff -u -rfa1a03cd89958eeba49f78a13b9638499bbd385f -rbf3d839b523336d9b97a1b135a358d898605d6be
--- lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision fa1a03cd89958eeba49f78a13b9638499bbd385f)
+++ lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision bf3d839b523336d9b97a1b135a358d898605d6be)
@@ -52,12 +52,15 @@
 INSERT INTO lams_tool_session_state VALUES  (2, 'INCOMPLETE');
 INSERT INTO lams_tool_session_state VALUES  (3, 'COMPLETED');
 
-INSERT INTO lams_user_tool_session_state VALUES (1, 'JOINED');
-INSERT INTO lams_user_tool_session_state VALUES (2, 'LEFT' );
-INSERT INTO lams_user_tool_session_state VALUES (3, 'SUSPENDED');
-INSERT INTO lams_user_tool_session_state VALUES (4, 'RESUMED');
-INSERT INTO lams_user_tool_session_state VALUES (5, 'ERROR');
+--INSERT INTO lams_user_tool_session_state VALUES (1, 'JOINED');
+--INSERT INTO lams_user_tool_session_state VALUES (2, 'LEFT' );
+--INSERT INTO lams_user_tool_session_state VALUES (3, 'SUSPENDED');
+--INSERT INTO lams_user_tool_session_state VALUES (4, 'RESUMED');
+--INSERT INTO lams_user_tool_session_state VALUES (5, 'ERROR');
 
+INSERT INTO lams_tool_session_type VALUES  (1, 'GROUPED');
+INSERT INTO lams_tool_session_type VALUES  (2, 'NON_GROUPED');
+
 INSERT INTO lams_lesson_state VALUES (1, 'NOT_STARTED');
 INSERT INTO lams_lesson_state VALUES (2, 'STARTED');
 INSERT INTO lams_lesson_state VALUES (3, 'SUSPENDED');