Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -reebdf6c7a06bd126cf6331883dd60e4ca72ac5c9 -r496ea8c9fb835a69057f28bbdfa2f2749b6f297c
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision eebdf6c7a06bd126cf6331883dd60e4ca72ac5c9)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 496ea8c9fb835a69057f28bbdfa2f2749b6f297c)
@@ -61,15 +61,6 @@
             length="255"
         />
 
-        <property
-            name="contentID"
-            type="java.lang.Long"
-            update="true"
-            insert="true"
-            column="content_id"
-            length="20"
-        />
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-InstructionFiles.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
diff -u -reebdf6c7a06bd126cf6331883dd60e4ca72ac5c9 -r496ea8c9fb835a69057f28bbdfa2f2749b6f297c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision eebdf6c7a06bd126cf6331883dd60e4ca72ac5c9)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	(.../InstructionFiles.hbm.xml)	(revision 496ea8c9fb835a69057f28bbdfa2f2749b6f297c)
@@ -61,15 +61,6 @@
             length="255"
         />
 
-        <property
-            name="contentID"
-            type="java.lang.Long"
-            update="true"
-            insert="true"
-            column="content_id"
-            length="20"
-        />
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-InstructionFiles.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java
===================================================================
diff -u -reebdf6c7a06bd126cf6331883dd60e4ca72ac5c9 -r496ea8c9fb835a69057f28bbdfa2f2749b6f297c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision eebdf6c7a06bd126cf6331883dd60e4ca72ac5c9)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	(.../InstructionFiles.java)	(revision 496ea8c9fb835a69057f28bbdfa2f2749b6f297c)
@@ -37,7 +37,6 @@
 	private Long versionID;
 	private String name;
 	private String type;
-	private Long contentID;
 
 	/**
      * @hibernate.id generator-class="identity" type="java.lang.Long" column="file_id"
@@ -116,18 +115,4 @@
 	public void setName(String name) {
 		this.name = name;
 	}
-	/**
-	 * @hibernate.property column="content_id" length="20"
-	 * @return Returns the content_id.
-	 */
-	public Long getContentID() {
-		return contentID;
-	}
-	/**
-	 * 
-	 * @param content_id The content_id to set.
-	 */
-	public void setContentID(Long content_id) {
-		this.contentID = content_id;
-	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java
===================================================================
diff -u -reebdf6c7a06bd126cf6331883dd60e4ca72ac5c9 -r496ea8c9fb835a69057f28bbdfa2f2749b6f297c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	(.../SubmitFilesContentDAO.java)	(revision eebdf6c7a06bd126cf6331883dd60e4ca72ac5c9)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	(.../SubmitFilesContentDAO.java)	(revision 496ea8c9fb835a69057f28bbdfa2f2749b6f297c)
@@ -24,7 +24,7 @@
 public class SubmitFilesContentDAO extends BaseDAO implements ISubmitFilesContentDAO {
 
 	private static final String FIND_INSTRUCTION_FILE = "from " + InstructionFiles.class.getName() 
-													+ " where content_id=? and uuid=? and version_id=? and type=?";
+													+ " as i where content_id=? and i.uuID=? and i.versionID=? and i.type=?";
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO#getContentByID(java.lang.Long)