Index: lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.hbm.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r5fd10ceebe8627a5c9b67a59699cb4685d83a957
--- lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.hbm.xml	(.../Dimdim.hbm.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.hbm.xml	(.../Dimdim.hbm.xml)	(revision 5fd10ceebe8627a5c9b67a59699cb4685d83a957)
@@ -87,15 +87,24 @@
         />
 
         <property
-            name="allowRichEditor"
+            name="reflectOnActivity"
             type="boolean"
             update="true"
             insert="true"
-            column="allow_rich_editor"
+            column="reflect_on_activity"
             length="1"
         />
 
         <property
+            name="reflectInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="reflect_instructions"
+            length="65535"
+        />
+
+        <property
             name="onlineInstructions"
             type="java.lang.String"
             update="true"
@@ -179,38 +188,13 @@
         </set>
 
         <property
-            name="maxParticipants"
+            name="maxAttendeeMikes"
             type="java.lang.Integer"
             update="true"
             insert="true"
-            column="max_participants"
+            column="max_attendee_mikes"
         />
 
-        <property
-            name="meetingDurationInHours"
-            type="java.lang.Integer"
-            update="true"
-            insert="true"
-            column="meeting_duration_in_hours"
-        />
-
-        <property
-            name="allowVideo"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="allow_video"
-            length="1"
-        />
-
-        <property
-            name="attendeeMikes"
-            type="java.lang.Integer"
-            update="true"
-            insert="true"
-            column="attendee_mikes"
-        />
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Dimdim.xml
Index: lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.hbm.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r5fd10ceebe8627a5c9b67a59699cb4685d83a957
--- lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.hbm.xml	(.../DimdimAttachment.hbm.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.hbm.xml	(.../DimdimAttachment.hbm.xml)	(revision 5fd10ceebe8627a5c9b67a59699cb4685d83a957)
@@ -76,6 +76,7 @@
             outer-join="auto"
             update="true"
             insert="true"
+            foreign-key="fk_laddim10_dimdim_attachment_to_dimdim"
         >
             <column
                 name="dimdim_uid" 
Index: lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml
===================================================================
diff -u
--- lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml	(revision 0)
+++ lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml	(revision 5fd10ceebe8627a5c9b67a59699cb4685d83a957)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.dimdim.model.DimdimConfig"
+        table="tl_laddim10_dimdim_config"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-DimdimConfig.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="key"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="config_key"
+        />
+
+        <property
+            name="value"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="config_value"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-DimdimConfig.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r5fd10ceebe8627a5c9b67a59699cb4685d83a957
--- lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml	(.../DimdimSession.hbm.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml	(.../DimdimSession.hbm.xml)	(revision 5fd10ceebe8627a5c9b67a59699cb4685d83a957)
@@ -75,6 +75,7 @@
             outer-join="auto"
             update="true"
             insert="true"
+            foreign-key="fk_laddim10_dimdim_session_to_dimdim"
         >
             <column
                 name="dimdim_uid" 
@@ -100,6 +101,22 @@
 
         </set>
 
+        <property
+            name="meetingKey"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="meeting_key"
+        />
+
+        <property
+            name="maxAttendeeMikes"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="max_attendee_mikes"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-DimdimSession.xml
Index: lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.hbm.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r5fd10ceebe8627a5c9b67a59699cb4685d83a957
--- lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.hbm.xml	(.../DimdimUser.hbm.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.hbm.xml	(.../DimdimUser.hbm.xml)	(revision 5fd10ceebe8627a5c9b67a59699cb4685d83a957)
@@ -76,18 +76,19 @@
             outer-join="auto"
             update="true"
             insert="true"
+            foreign-key="fk_laddim10_dimdim_user_to_dimdim_session"
         >
             <column
                 name="dimdim_session_uid" 
             />
         </many-to-one>
 
         <property
-            name="entryUID"
+            name="notebookEntryUID"
             type="java.lang.Long"
             update="true"
             insert="true"
-            column="entry_uid"
+            column="notebook_entry_uid"
         />
 
         <!--