Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -r4cd6eb7c6c1ad1410dd33d854bd833f567d77acf -r3c0157a30f00131b7c63609a87f3042230f8942a
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 4cd6eb7c6c1ad1410dd33d854bd833f567d77acf)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 3c0157a30f00131b7c63609a87f3042230f8942a)
@@ -21,12 +21,13 @@
 )TYPE=InnoDB;
 
 CREATE TABLE lams.tl_laqa11_session (
-       qa_session_id BIGINT(20) NOT NULL
+       uid BIGINT(20) NOT NULL AUTO_INCREMENT
+     , qa_session_id BIGINT(20) NOT NULL
      , session_start_date DATETIME
      , session_end_date DATETIME
      , session_status VARCHAR(100)
      , qa_content_id BIGINT(20) NOT NULL
-     , PRIMARY KEY (qa_session_id)
+     , PRIMARY KEY (uid)
      , INDEX (qa_content_id)
      , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (qa_content_id)
                   REFERENCES lams.tl_laqa11_content (uid)
@@ -41,12 +42,11 @@
      , PRIMARY KEY (uid)
      , INDEX (qa_session_id)
      , CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (qa_session_id)
-                  REFERENCES lams.tl_laqa11_session (qa_session_id)
+                  REFERENCES lams.tl_laqa11_session (uid)
 )TYPE=InnoDB;
 
 CREATE TABLE lams.tl_laqa11_que_content (
        uid BIGINT(20) NOT NULL AUTO_INCREMENT
-     , qa_que_content_id BIGINT(20) NOT NULL
      , question VARCHAR(255)
      , display_order INT(5)
      , qa_content_id BIGINT(20) NOT NULL
@@ -57,7 +57,7 @@
 )TYPE=InnoDB;
 
 CREATE TABLE lams.tl_laqa11_usr_resp (
-       response_id BIGINT(20) NOT NULL
+       response_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , hidden TINYINT(1) DEFAULT 0
      , answer VARCHAR(255)
      , time_zone VARCHAR(255)
@@ -89,4 +89,4 @@
 INSERT INTO tl_laqa11_content (qa_content_id, 	creation_date)  VALUES (${default_content_id}, NOW());
 
 -- data for content questions table
-INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('What is the capital of Russia?',1,${default_content_id});
+INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('What is the capital of Russia?',1,${default_content_id});
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
diff -u -r33127f690e04777acb08682f48994e5c102e4967 -r3c0157a30f00131b7c63609a87f3042230f8942a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 3c0157a30f00131b7c63609a87f3042230f8942a)
@@ -9,15 +9,16 @@
         table="tl_laqa11_que_content"
     >
 
-        <id
-            name="qaQueContentId"
-            column="qa_que_content_id"
-            type="java.lang.Long"
-        >
-		    <generator class="increment"/>
-        </id>
+    <id
+        name="uid"
+        type="java.lang.Long"
+        column="uid"
+    >
+        <generator class="native" />
+    </id>
 
-        <property
+
+	   <property
             name="question"
             type="java.lang.String"
             access="property"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
===================================================================
diff -u -r4cd6eb7c6c1ad1410dd33d854bd833f567d77acf -r3c0157a30f00131b7c63609a87f3042230f8942a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java	(.../QaQueContent.java)	(revision 4cd6eb7c6c1ad1410dd33d854bd833f567d77acf)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java	(.../QaQueContent.java)	(revision 3c0157a30f00131b7c63609a87f3042230f8942a)
@@ -52,9 +52,6 @@
 	/** identifier field */
     private Long uid;
 
-    /** identifier field */
-    private Long qaQueContentId;
-    
     /** nullable persistent field */
     private String question;
 
@@ -145,7 +142,7 @@
     
     public String toString() {
         return new ToStringBuilder(this)
-            .append("qaQueContentId: ", getQaQueContentId())
+            .append("qaQueContentId: ", getUid())
 			.append("question: ", getQuestion())
 			.append("displayOrder: ", getDisplayOrder())
             .toString();
@@ -155,13 +152,13 @@
         if ( !(other instanceof QaQueContent) ) return false;
         QaQueContent castOther = (QaQueContent) other;
         return new EqualsBuilder()
-            .append(this.getQaQueContentId(), castOther.getQaQueContentId())
+            .append(this.getUid(), castOther.getUid())
             .isEquals();
     }
 
     public int hashCode() {
         return new HashCodeBuilder()
-            .append(getQaQueContentId())
+            .append(getUid())
             .toHashCode();
     }
   
@@ -190,19 +187,8 @@
 	public void setQaContent(org.lamsfoundation.lams.tool.qa.QaContent qaContent) {
 		this.qaContent = qaContent;
 	}
+	
 	/**
-	 * @return Returns the qaQueContentId.
-	 */
-	public Long getQaQueContentId() {
-		return qaQueContentId;
-	}
-	/**
-	 * @param qaQueContentId The qaQueContentId to set.
-	 */
-	public void setQaQueContentId(Long qaQueContentId) {
-		this.qaQueContentId = qaQueContentId;
-	}
-	/**
 	 * @return Returns the qaQueUsers.
 	 */
 	public Set getQaQueUsers() {
@@ -338,10 +324,10 @@
         QaQueContent queContent = (QaQueContent) o;
         
         //if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference.
-        if (qaQueContentId == null)
+        if (uid == null)
         	return 1;
 		else
-			return (int) (qaQueContentId.longValue() - queContent.qaQueContentId.longValue());
+			return (int) (uid.longValue() - queContent.uid.longValue());
         
     }
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
diff -u -r33127f690e04777acb08682f48994e5c102e4967 -r3c0157a30f00131b7c63609a87f3042230f8942a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 3c0157a30f00131b7c63609a87f3042230f8942a)
@@ -8,14 +8,26 @@
     name="org.lamsfoundation.lams.tool.qa.QaSession" 
     table="tl_laqa11_session"
 >
+
     <id
+        name="uid"
+        type="java.lang.Long"
+        column="uid"
+    >
+        <generator class="native" />
+    </id>
+
+
+	<property
         name="qaSessionId"
         type="java.lang.Long"
         column="qa_session_id"
+        not-null="true"
+        length="20"
     >
-		    <generator class="assigned"/>
-    </id>
+    </property>
 
+
     <property
         name="session_start_date"
         type="java.util.Date"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java
===================================================================
diff -u -re693b778e6201af40e4ea93f2a0d06b5ca5cf462 -r3c0157a30f00131b7c63609a87f3042230f8942a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java	(.../QaSession.java)	(revision e693b778e6201af40e4ea93f2a0d06b5ca5cf462)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java	(.../QaSession.java)	(revision 3c0157a30f00131b7c63609a87f3042230f8942a)
@@ -51,7 +51,10 @@
     public final static String INCOMPLETE = "INCOMPLETE";
     
     public static final String COMPLETED = "COMPLETED";
-    
+
+	/** identifier field */
+    private Long uid;
+
     /** identifier field */
     private Long qaSessionId;
 
@@ -362,4 +365,16 @@
 	public void setQaContentId(Long qaContentId) {
 		this.qaContentId = qaContentId;
 	}
+	/**
+	 * @return Returns the uid.
+	 */
+	public Long getUid() {
+		return uid;
+	}
+	/**
+	 * @param uid The uid to set.
+	 */
+	public void setUid(Long uid) {
+		this.uid = uid;
+	}
 }