diff --git a/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/VisitOccurrence.java b/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/VisitOccurrence.java
index f8d00c6..df3f66e 100644
--- a/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/VisitOccurrence.java
+++ b/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/VisitOccurrence.java
@@ -71,7 +71,6 @@ public class VisitOccurrence extends BaseResourceEntity {
 	
 	@ManyToOne
 	@JoinColumn(name="place_of_service_concept_id", nullable=false)
-	@Audited(targetAuditMode=RelationTargetAuditMode.NOT_AUDITED)
 	@NotNull
 	private Concept placeOfServiceConcept;
 	
@@ -187,8 +186,7 @@ public IResourceEntity constructEntityFromResource(IResource resource) {
 		this.id = encounter.getId().getIdPartAsLong();
 		Long patientRef = encounter.getPatient().getReference().getIdPartAsLong();
 		if(patientRef != null){
-			if(this.person == null)
-				this.person = new Person();
+			this.person = new Person();
 			this.person.setId(patientRef);
 		}
 		/* Set Period */
@@ -202,8 +200,7 @@ public IResourceEntity constructEntityFromResource(IResource resource) {
 			if(careSite != null){
 				this.careSite = careSite;
 				/* Set place of service concept */
-				if(this.placeOfServiceConcept == null)
-					this.placeOfServiceConcept = new Concept();
+				this.placeOfServiceConcept = new Concept();
 				this.placeOfServiceConcept.setId(this.careSite.getPlaceOfServiceConcept().getId()); //TODO add test case, to avoid optionallity of care site 
 			}
 			
diff --git a/gt-fhir-webapp/src/main/resources/META-INF/persistence.xml b/gt-fhir-webapp/src/main/resources/META-INF/persistence.xml
index 24137f0..541b3f8 100644
--- a/gt-fhir-webapp/src/main/resources/META-INF/persistence.xml
+++ b/gt-fhir-webapp/src/main/resources/META-INF/persistence.xml
@@ -39,6 +39,7 @@
 			<property name="hibernate.cache.use_query_cache" value="false" />
 			<property name="hibernate.cache.use_second_level_cache" value="false" />
 			<property name="hibernate.cache.use_structured_entries" value="false" />
+			<!-- <property name="org.hibernate.envers.audit_strategy" value="org.hibernate.envers.strategy.ValidityAuditStrategy"/> -->
 		</properties>                                                    
 	</persistence-unit>
 </persistence>