diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java
index 396b1c5c59b..e5a77df0e93 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java
@@ -1431,7 +1431,7 @@ public class Test extends BaseResource implements IResource {
   
 	@Override
 	public ResourceTypeEnum getResourceType() {
-		return ResourceTypeEnum.TEST;
+		return null;
 	}
 
 }
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java
index 584193d7d9f..783226584d0 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java
@@ -362,8 +362,123 @@ public enum ResourceTypeEnum {
 	 *
 	 * A value set specifies a set of codes drawn from one or more code systems.
 	 */
-	VALUESET("ValueSet", "http://hl7.org/fhir/resource-types"),
+	VALUESET("ValueSet", "http://hl7.org/fhir/resource-types"), 
 	
+	/**
+	 * New types
+	 */
+	
+	/**
+	 * Code Value: <b>Appointment</b>
+	 * 
+	 * A scheduled appointment for a patient and/or practitioner(s) where a service may take place.
+	 */
+	APPOINTMENT("Appointment", "http://hl7.org/fhir/resource-types"), 
+	
+	/**
+	 * Code Value: <b>AppointmentResponse</b> 
+	 * 
+	 * A response to a scheduled appointment for a patient and/or practitioner(s)
+	 */
+	APPOINTMENTRESPONSE("AppointmentResponse","http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>Availability</b> 
+	 * 
+	 * A container for slot(s) of time that may be available for booking appointments
+	 */
+	AVAILABILITY("Availability","http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>Binary</b>
+	 *  
+	 * http://hl7.org/fhir/profiles/Binary
+	 */
+	BINARY("Binary", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>Claim</b> 
+	 * 
+	 * A claim
+	 */
+	CLAIM("Claim", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>Coverage</b>
+	 * 
+	 * Insurance or medical plan
+	 */
+	COVERAGE("Coverage", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>GeneExpression</b> 
+	 * 
+	 * Resource that records the patient's expression of a gene
+	 */
+	GENEEXPRESSION("GeneExpression", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>GeneticAnalysis</b> 
+	 * 
+	 * Analysis of a patient's genetic test
+	 */
+	GENETICANALYSIS("GeneticAnalysis", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>GVFMeta</b>
+	 *  
+	 * Meta data of a GVF file
+	 */
+	GVFMETA("GVFMeta", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>GVFVariant</b> 
+	 *  
+	 * A segment of a GVF file
+	 */
+	GVFVARIANT("GVFVariant", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>Microarray</b> 
+	 *  
+	 * A resource that displays result of a  microarray
+	 */
+	MICROARRAY("Microarray", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>Remittance</b> 
+	 *  
+	 * A remittance
+	 */
+	REMITTANCE("Remittance", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>SequencingAnalysis</b> 
+	 *  
+	 * Computational analysis on a patient's genetic raw file
+	 */
+	SEQUENCINGANALYSIS("SequencingAnalysis", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>SequencingLab</b> 
+	 *  
+	 * A lab for sequencing
+	 */
+	SEQUENCINGLAB("SequencingLab", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>Slot</b> 
+	 *  
+	 * A slot of time that may be available for booking appointments
+	 */
+	SLOT("Slot", "http://hl7.org/fhir/resource-types"),
+	
+	/**
+	 * Code Value: <b>User</b> 
+	 *  
+	 * A user authorized to use the system
+	 */
+	USER("User", "http://hl7.org/fhir/resource-types"),
 	;
 	
 	/**
diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java
index 998733ff8e5..0137f6ca754 100644
--- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java
+++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java
@@ -11,6 +11,7 @@ import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Extension;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
+import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
 import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.model.primitive.StringDt;
@@ -192,6 +193,11 @@ public class ResourceWithExtensionsA extends BaseResource {
 		return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType ); // not implemented
 	}
 
+	@Override
+	public ResourceTypeEnum getResourceType() {		
+		return null; //not implemented
+	}
+
 	
 	
 
diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/Patient.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/Patient.java
index 8446c4ea371..647b54b1788 100644
--- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/Patient.java
+++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/Patient.java
@@ -25,6 +25,7 @@ import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
 
 /**
  * HAPI/FHIR <b>Patient</b> Resource
@@ -105,6 +106,12 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+
+	@Override
+	public ResourceTypeEnum getResourceType() {
+		return ResourceTypeEnum.PATIENT;
+	}
+