Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java
===================================================================
diff -u -r302de05d96387b309e2ebbaac06898a2df0eb949 -r350893379438654612e3ce1787d7aa45ed04ae64
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java	(.../Attachment.java)	(revision 302de05d96387b309e2ebbaac06898a2df0eb949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java	(.../Attachment.java)	(revision 350893379438654612e3ce1787d7aa45ed04ae64)
@@ -1,24 +1,29 @@
 package org.lamsfoundation.lams.tool.forum.persistence;
 
+import java.io.InputStream;
+
 /**
  * @author conradb
  *
  * A Wrapper class for uploaded files. An Attachment cannot exist independently
  * and must belong to a Forum.
  * 
  *
- * @hibernate.joined-subclass table="ATTACHMENT"
+ * @hibernate.joined-subclass table="tl_lafrum11_attachment"
  * @hibernate.joined-subclass-key column="id"
  *
  * @hibernate.query name="allAttachments" query="from Attachment attachment"
  * @hibernate.query name="getAttachmentbyType" query="from Attachment attachment where attachment.type = ?"
  */
 public class Attachment extends GenericEntity {
     protected Long uuid;
-    protected boolean type;
+    protected Long version;
+    protected String type;
     protected String name;
-    public final static boolean TYPE_ONLINE = true;
-    public final static boolean TYPE_OFFLINE = false;
+    protected InputStream inputStream;
+    protected String contentType;
+    public final static String TYPE_ONLINE = "ONLINE";
+    public final static String TYPE_OFFLINE = "OFFLINE";
 
     /**
      * @hibernate.property column="UUID"
@@ -33,19 +38,25 @@
     }
 
     /**
-     * @hibernate.property column="TYPE"
+     * @hibernate.property column="VERSION"
+     *
      */
-    public boolean getType() {
+    public Long getVersion() {
+        return version;
+    }
+
+    public void setVersion(Long version) {
+        this.version = version;
+    }
+
+    public String getType() {
         return type;
     }
 
-    public void setType(boolean type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-    /**
-     * @hibernate.property column="NAME"
-     */
     public String getName() {
         return name;
     }
@@ -54,5 +65,20 @@
         this.name = name;
     }
 
+    public InputStream getInputStream() {
+        return inputStream;
+    }
 
+    public void setStream(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -r9a73adef86c080dc6aa2cbaf9147107234dd97b2 -r350893379438654612e3ce1787d7aa45ed04ae64
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 9a73adef86c080dc6aa2cbaf9147107234dd97b2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 350893379438654612e3ce1787d7aa45ed04ae64)
@@ -6,7 +6,7 @@
  * Forum
  * @author conradb
  *
- * @hibernate.joined-subclass table="FORUM"
+ * @hibernate.joined-subclass table="tl_lafrum11_forum"
  * @hibernate.joined-subclass-key column="id"
  *
  * @hibernate.query name="allForums" query="from Forum forum"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.java
===================================================================
diff -u -rb74ad99208e8a197cb7c89a4db9247ead7563bdc -r350893379438654612e3ce1787d7aa45ed04ae64
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.java	(.../GenericEntity.java)	(revision b74ad99208e8a197cb7c89a4db9247ead7563bdc)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.java	(.../GenericEntity.java)	(revision 350893379438654612e3ce1787d7aa45ed04ae64)
@@ -7,7 +7,7 @@
  * @author conradb
  *
  *
- * @hibernate.class table="GENERICENTITY"
+ * @hibernate.class table="tl_lafrum11_genericentity"
  *
  * @hibernate.query name="all" query="from GenericEntity genericEntity"
  */
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -r6e1c39e9f7085b25d32054469296aeb5ab5b4d3a -r350893379438654612e3ce1787d7aa45ed04ae64
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 6e1c39e9f7085b25d32054469296aeb5ab5b4d3a)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 350893379438654612e3ce1787d7aa45ed04ae64)
@@ -6,7 +6,7 @@
 /**
  * @author conradb
  *
- * @hibernate.joined-subclass table="MESSAGE"
+ * @hibernate.joined-subclass table="tl_lafrum11_message"
  * @hibernate.joined-subclass-key column="id"
  *
  * @hibernate.query name="allMessages" query="from Message message"