diff --git a/api/src/main/java/org/openmrs/Field.java b/api/src/main/java/org/openmrs/Field.java
index d7049655774..b225c675e89 100644
--- a/api/src/main/java/org/openmrs/Field.java
+++ b/api/src/main/java/org/openmrs/Field.java
@@ -13,34 +13,66 @@
 import java.util.Set;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
 /**
  * Field
  *
  * @version 1.0
  */
+@Entity
+@Table(name = "field")
 @Audited
 public class Field extends BaseChangeableOpenmrsMetadata {
 	
 	public static final long serialVersionUID = 4454L;
 	
 	// Fields
-	
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "field_id_seq")
+	@GenericGenerator(
+		name = "field_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "field_field_id_seq")
+	)
+	@Column(name = "field_id")
 	private Integer fieldId;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "field_type")
 	private FieldType fieldType;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "concept_id")
 	private Concept concept;
-	
+
+	@Column(name = "table_name", length = 50)
 	private String tableName;
 	
+	@Column(name = "attribute_name", length = 50)
 	private String attributeName;
-	
+
+	@Column(name = "default_value", columnDefinition = "TEXT")
+	@Lob
 	private String defaultValue;
-	
+
+	@Column(name = "select_multiple", length = 1, nullable = false)
 	private Boolean selectMultiple = false;
 	
+	@Transient
 	private Set<FieldAnswer> answers;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc..71d7335c6ac 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -44,7 +44,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Drug.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/Field.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Form.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FormField.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml
deleted file mode 100644
index 2be5c7bed17..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-<!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.openmrs">
-
-	<class name="Field" table="field">
-
-		<id name="fieldId" type="int" column="field_id" unsaved-value="0">
-			<generator class="native">
-				<param name="sequence">field_field_id_seq</param>
-			</generator>
-		</id>
-		
-		
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
-
-		<property name="name" type="java.lang.String"
-			length="255" not-null="true"/>
-		
-		<property name="description" type="text" length="65535" />
-
-		<many-to-one name="fieldType" class="FieldType" not-null="true">
-			<column name="field_type" />
-		</many-to-one>
-
-		<many-to-one name="concept" class="Concept" column="concept_id" />
-		
-		<property name="tableName" type="java.lang.String"
-			column="table_name" length="50" />
-		
-		<property name="attributeName" type="java.lang.String"
-			column="attribute_name" length="50" />
-		
-		<property name="defaultValue" type="text"
-			column="default_value" length="65535" />
-
-		<property name="selectMultiple" type="boolean"
-			column="select_multiple" length="1" not-null="true"/>
-		
-		<many-to-one name="creator" class="User" not-null="true" />
-
-		<property name="dateCreated" type="java.util.Date"
-			column="date_created" not-null="true" length="19" />
-		
-		<many-to-one name="changedBy" class="User">
-			<column name="changed_by" />
-		</many-to-one>
-
-		<property name="dateChanged" type="java.util.Date"
-			column="date_changed" length="19" />
-
-		<!--
-		<set name="answers" lazy="true" inverse="true" cascade="save-update">
-			<key>
-				<column name="field_id" />
-			</key>
-			<one-to-many class="FieldAnswer" />
-		</set>
-		-->
-		
-		<many-to-one name="retiredBy" class="org.openmrs.User"
-			column="retired_by" />
-		<property name="dateRetired" type="java.util.Date"
-			column="date_retired" length="19" />
-		<property name="retireReason" type="java.lang.String"
-			column="retire_reason" length="255" />
-		<property name="retired" type="boolean" length="1"
-			not-null="true" />
-		
-	</class>
-</hibernate-mapping>
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index 6d553c03825..a363187c2ff 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2740,6 +2740,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(org.openmrs.Field.class)
 			.getMetadataBuilder().build();