diff --git a/api/src/main/java/org/openmrs/ConceptDatatype.java b/api/src/main/java/org/openmrs/ConceptDatatype.java
index bb891a213cd..7fa7c95db4a 100644
--- a/api/src/main/java/org/openmrs/ConceptDatatype.java
+++ b/api/src/main/java/org/openmrs/ConceptDatatype.java
@@ -9,12 +9,25 @@
  */
 package org.openmrs;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.search.annotations.DocumentId;
 
 /**
  * ConceptDatatype
  */
+@Entity
+@Table(name = "concept_datatype")
+@Cache(usage = CacheConcurrencyStrategy.READ_ONLY)
 @Audited
 public class ConceptDatatype extends BaseChangeableOpenmrsMetadata {
 	
@@ -66,8 +79,17 @@ public class ConceptDatatype extends BaseChangeableOpenmrsMetadata {
 	
 	// Fields
 	@DocumentId
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "concept_datatype_id_seq")
+	@GenericGenerator(
+			name = "concept_datatype_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "concept_datatype_concept_datatype_id_seq")
+		)
+	@Column(name = "concept_datatype_id")
 	private Integer conceptDatatypeId;
 	
+	@Column(name = "hl7_abbreviation", length = 3, nullable = true)
 	private String hl7Abbreviation;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc..f3249a90d70 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -31,7 +31,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptName.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptNameTag.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptClass.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptStateConversion.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptSet.hbm.xml" />
@@ -60,8 +59,8 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Role.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Patient.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml" />
-                <mapping resource="org/openmrs/api/db/hibernate/PatientProgram.hbm.xml" />
-                <mapping resource="org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml" />
+        <mapping resource="org/openmrs/api/db/hibernate/PatientProgram.hbm.xml" />
+        <mapping resource="org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/RelationshipType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Order.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml
deleted file mode 100644
index 7fab8cb0316..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml
+++ /dev/null
@@ -1,55 +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="ConceptDatatype" table="concept_datatype" mutable="false">
-	
-		<cache usage="read-only"/>
-
-		<id name="conceptDatatypeId" type="java.lang.Integer" column="concept_datatype_id" unsaved-value="0">
-			<generator class="native">
-				<param name="sequence">concept_datatype_concept_datatype_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" not-null="true"
-			length="255" />
-
-		<property name="description" type="java.lang.String" length="255" />
-
-		<property name="dateCreated" type="java.util.Date"
-			column="date_created" not-null="true" length="19" />
-
-		<property name="hl7Abbreviation" type="java.lang.String"
-			column="hl7_abbreviation" not-null="false" length="3" />
-
-		<many-to-one name="creator" class="User" not-null="true" />
-
-		<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..1b41f04549b 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2719,10 +2719,14 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 		StandardServiceRegistry standardRegistry = new StandardServiceRegistryBuilder()
 			.configure().applySettings(configuration.getProperties()).build();
 
-		Metadata metaData = new MetadataSources(standardRegistry).addAnnotatedClass(Allergy.class)
-			.addAnnotatedClass(Encounter.class).addAnnotatedClass(SomeTestOrder.class)
-			.addAnnotatedClass(Diagnosis.class).addAnnotatedClass(Condition.class)
-			.addAnnotatedClass(Visit.class).addAnnotatedClass(VisitAttributeType.class)
+		Metadata metaData = new MetadataSources(standardRegistry)
+				.addAnnotatedClass(Allergy.class)
+			.addAnnotatedClass(Encounter.class)
+			.addAnnotatedClass(SomeTestOrder.class)
+			.addAnnotatedClass(Diagnosis.class)
+			.addAnnotatedClass(Condition.class)
+			.addAnnotatedClass(Visit.class)
+			.addAnnotatedClass(VisitAttributeType.class)
 			.addAnnotatedClass(MedicationDispense.class)
 			.addAnnotatedClass(ProviderAttributeType.class)
 			.addAnnotatedClass(ConceptMapType.class)
@@ -2740,6 +2744,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(ConceptDatatype.class)
 			.getMetadataBuilder().build();