diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/service/impl/AbstractDhisMetadataServiceImpl.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/service/impl/AbstractDhisMetadataServiceImpl.java
index fc466c7b..102aab20 100644
--- a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/service/impl/AbstractDhisMetadataServiceImpl.java
+++ b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/service/impl/AbstractDhisMetadataServiceImpl.java
@@ -123,13 +123,12 @@ public Optional<T> findMetadataRefreshedByReference( @Nonnull Reference referenc
     @HystrixCommand( ignoreExceptions = UnauthorizedException.class )
     @Nonnull
     @Override
-    @CachePut( cacheResolver = "dhisMetadataCacheResolver", unless = "#result==null" )
     public Optional<T> findOneByReference( @Nonnull Reference reference )
     {
         return findOneByReference( userRestTemplate, reference );
     }
 
-    @HystrixCommand( ignoreExceptions = UnauthorizedException.class )
+    @HystrixCommand( ignoreExceptions = { UnauthorizedException.class, DhisFindException.class } )
     @Nonnull
     @Override
     public DhisResourceResult<T> find( @Nonnull UriFilterApplier uriFilterApplier, int from, int max )
diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/EnrollmentService.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/EnrollmentService.java
index fa3db68c..4c8f77fd 100644
--- a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/EnrollmentService.java
+++ b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/EnrollmentService.java
@@ -28,6 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import org.dhis2.fhir.adapter.dhis.model.DhisResourceResult;
+import org.dhis2.fhir.adapter.dhis.model.UriFilterApplier;
 import org.dhis2.fhir.adapter.dhis.service.DhisService;
 
 import javax.annotation.Nonnull;
@@ -55,4 +57,7 @@ public interface EnrollmentService extends DhisService<Enrollment>
     Enrollment createOrUpdate( @Nonnull Enrollment enrollment );
 
     boolean delete( @Nonnull String enrollmentId );
+
+    @Nonnull
+    DhisResourceResult<Enrollment> find( @Nonnull UriFilterApplier uriFilterApplier, int from, int max );
 }
diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EnrollmentServiceImpl.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EnrollmentServiceImpl.java
index ba8b1e07..b0d47089 100644
--- a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EnrollmentServiceImpl.java
+++ b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EnrollmentServiceImpl.java
@@ -33,24 +33,29 @@
 import org.dhis2.fhir.adapter.auth.UnauthorizedException;
 import org.dhis2.fhir.adapter.cache.RequestCacheService;
 import org.dhis2.fhir.adapter.dhis.DhisConflictException;
+import org.dhis2.fhir.adapter.dhis.DhisFindException;
 import org.dhis2.fhir.adapter.dhis.DhisImportUnsuccessfulException;
 import org.dhis2.fhir.adapter.dhis.local.LocalDhisRepositoryPersistCallback;
 import org.dhis2.fhir.adapter.dhis.local.LocalDhisRepositoryPersistResult;
 import org.dhis2.fhir.adapter.dhis.local.LocalDhisRepositoryPersistStatus;
 import org.dhis2.fhir.adapter.dhis.local.LocalDhisResourceRepositoryTemplate;
 import org.dhis2.fhir.adapter.dhis.model.DhisResourceComparator;
+import org.dhis2.fhir.adapter.dhis.model.DhisResourceResult;
 import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
 import org.dhis2.fhir.adapter.dhis.model.ImportStatus;
 import org.dhis2.fhir.adapter.dhis.model.ImportSummaries;
 import org.dhis2.fhir.adapter.dhis.model.ImportSummariesWebMessage;
 import org.dhis2.fhir.adapter.dhis.model.ImportSummary;
 import org.dhis2.fhir.adapter.dhis.model.Status;
+import org.dhis2.fhir.adapter.dhis.model.UriFilterApplier;
 import org.dhis2.fhir.adapter.dhis.tracker.program.Enrollment;
 import org.dhis2.fhir.adapter.dhis.tracker.program.EnrollmentService;
 import org.dhis2.fhir.adapter.dhis.tracker.program.EnrollmentStatus;
 import org.dhis2.fhir.adapter.dhis.tracker.program.Event;
 import org.dhis2.fhir.adapter.dhis.tracker.program.EventService;
 import org.dhis2.fhir.adapter.dhis.util.CodeGenerator;
+import org.dhis2.fhir.adapter.dhis.util.DhisPagingQuery;
+import org.dhis2.fhir.adapter.dhis.util.DhisPagingUtils;
 import org.dhis2.fhir.adapter.rest.RestTemplateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -64,9 +69,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -125,6 +132,37 @@ public DhisResourceType getDhisResourceType()
         return DhisResourceType.ENROLLMENT;
     }
 
+    @HystrixCommand( ignoreExceptions = { UnauthorizedException.class, DhisFindException.class } )
+    @Nonnull
+    @Override
+    public DhisResourceResult<Enrollment> find( @Nonnull UriFilterApplier uriFilterApplier, int from, int max )
+    {
+        final DhisPagingQuery pagingQuery = DhisPagingUtils.createPagingQuery( from, max );
+        final List<String> variables = new ArrayList<>();
+        final String uri = uriFilterApplier.add( UriComponentsBuilder.newInstance(), variables ).path( "/enrollments.json" )
+            .queryParam( "skipPaging", "false" ).queryParam( "page", pagingQuery.getPage() ).queryParam( "pageSize", pagingQuery.getPageSize() )
+            .queryParam( "ouMode", uriFilterApplier.containsQueryParam( "ou" ) ? "SELECTED" : "ACCESSIBLE" )
+            .queryParam( "fields", ":all" ).build().toString();
+        final ResponseEntity<DhisEnrollments> result;
+        try
+        {
+            result = restTemplate.getForEntity( uri, DhisEnrollments.class, variables.toArray() );
+        }
+        catch ( HttpClientErrorException e )
+        {
+            if ( e.getStatusCode() == HttpStatus.BAD_REQUEST || e.getStatusCode() == HttpStatus.CONFLICT )
+            {
+                throw new DhisFindException( e.getMessage(), e );
+            }
+            throw e;
+        }
+        final DhisEnrollments enrollments = Objects.requireNonNull( result.getBody() );
+
+        return new DhisResourceResult<>( ( enrollments.getEnrollments().size() > pagingQuery.getResultOffset() ) ?
+            enrollments.getEnrollments().subList( pagingQuery.getResultOffset(), enrollments.getEnrollments().size() ) : Collections.emptyList(),
+            ( enrollments.getEnrollments().size() >= pagingQuery.getPageSize() ) );
+    }
+
     @HystrixCommand( ignoreExceptions = UnauthorizedException.class )
     @Nonnull
     @Override
diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EventServiceImpl.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EventServiceImpl.java
index 4cf20c3a..437e279a 100644
--- a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EventServiceImpl.java
+++ b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/program/impl/EventServiceImpl.java
@@ -447,7 +447,7 @@ protected Event update( @Nonnull Event event )
         return event;
     }
 
-    @HystrixCommand( ignoreExceptions = UnauthorizedException.class )
+    @HystrixCommand( ignoreExceptions = { UnauthorizedException.class, DhisFindException.class } )
     @Nonnull
     @Override
     public DhisResourceResult<Event> find( @Nonnull String programId, @Nonnull String programStageId, @Nonnull UriFilterApplier uriFilterApplier, int from, int max )
diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/trackedentity/impl/TrackedEntityServiceImpl.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/trackedentity/impl/TrackedEntityServiceImpl.java
index a955f56c..0da19f9a 100644
--- a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/trackedentity/impl/TrackedEntityServiceImpl.java
+++ b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/trackedentity/impl/TrackedEntityServiceImpl.java
@@ -433,7 +433,7 @@ public boolean persistDeleteById( @Nonnull String id )
         return _delete( id );
     }
 
-    @HystrixCommand( ignoreExceptions = UnauthorizedException.class )
+    @HystrixCommand( ignoreExceptions = { UnauthorizedException.class, DhisFindException.class } )
     @Nonnull
     @Override
     public DhisResourceResult<TrackedEntityInstance> find( @Nonnull String trackedEntityTypeId, @Nonnull UriFilterApplier uriFilterApplier, int from, int max )
diff --git a/docs/fhir/profiles/TrackerProgramCarePlan.StructureDefinition.xml b/docs/fhir/profiles/TrackerProgramCarePlan.StructureDefinition.xml
index 185560b2..c3f0c2ac 100644
--- a/docs/fhir/profiles/TrackerProgramCarePlan.StructureDefinition.xml
+++ b/docs/fhir/profiles/TrackerProgramCarePlan.StructureDefinition.xml
@@ -66,6 +66,7 @@
       <label value="Incident date" />
       <short value="Incident date of enrollment" />
       <definition value="The incident date of the enrollment." />
+      <max value="1" />
       <type>
         <code value="Extension" />
         <profile value="http://www.dhis2.org/dhis2-fhir-adapter/extensions/incident-date" />
@@ -145,8 +146,8 @@
     </element>
     <element id="CarePlan.status">
       <path value="CarePlan.status" />
-      <short value="active | completed | cancelled" />
-      <definition value="active | completed | cancelled" />
+      <short value="active | completed | revoked" />
+      <definition value="active | completed | revoked (cancelled)" />
     </element>
     <element id="CarePlan.intent">
       <path value="CarePlan.intent" />
@@ -227,6 +228,10 @@
       <path value="CarePlan.goal" />
       <max value="0" />
     </element>
+    <element id="CarePlan.activity">
+      <path value="CarePlan.activity" />
+      <max value="0" />
+    </element>
     <element id="CarePlan.activity.outcomeCodeableConcept">
       <path value="CarePlan.activity.outcomeCodeableConcept" />
       <max value="0" />
diff --git a/fhir-dstu3/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/util/dstu3/Dstu3ValueTypeFhirToDhisTransformerUtils.java b/fhir-dstu3/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/util/dstu3/Dstu3ValueTypeFhirToDhisTransformerUtils.java
index f6d0c0ea..a73d14e1 100644
--- a/fhir-dstu3/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/util/dstu3/Dstu3ValueTypeFhirToDhisTransformerUtils.java
+++ b/fhir-dstu3/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/util/dstu3/Dstu3ValueTypeFhirToDhisTransformerUtils.java
@@ -104,6 +104,11 @@ protected Object convert( @Nullable IBaseDatatype fhirValue, @Nonnull ValueType
             case INTEGER_POSITIVE:
             case INTEGER_NEGATIVE:
             case INTEGER_ZERO_OR_POSITIVE:
+                if ( fhirValue.isEmpty() )
+                {
+                    return null;
+                }
+
                 if ( fhirValue instanceof IPrimitiveType && ( (IPrimitiveType) fhirValue ).getValue() instanceof Integer )
                 {
                     return ( (IPrimitiveType) fhirValue ).getValueAsString();
@@ -118,6 +123,11 @@ protected Object convert( @Nullable IBaseDatatype fhirValue, @Nonnull ValueType
             case NUMBER:
             case PERCENTAGE:
             case UNIT_INTERVAL:
+                if ( fhirValue.isEmpty() )
+                {
+                    return null;
+                }
+
                 if ( fhirValue instanceof IPrimitiveType && ( (IPrimitiveType) fhirValue ).getValue() instanceof Number )
                 {
                     return ( (IPrimitiveType) fhirValue ).getValueAsString();
@@ -127,6 +137,11 @@ protected Object convert( @Nullable IBaseDatatype fhirValue, @Nonnull ValueType
             case DATETIME:
             case DATE:
             case AGE:
+                if ( fhirValue.isEmpty() )
+                {
+                    return null;
+                }
+
                 if ( fhirValue instanceof DateTimeType )
                 {
                     return DateTimeFormatter.ISO_LOCAL_DATE_TIME
@@ -143,6 +158,11 @@ protected Object convert( @Nullable IBaseDatatype fhirValue, @Nonnull ValueType
                 break;
             case BOOLEAN:
             case TRUE_ONLY:
+                if ( fhirValue.isEmpty() )
+                {
+                    return null;
+                }
+
                 if ( fhirValue instanceof IPrimitiveType && ( (IPrimitiveType) fhirValue ).getValue() instanceof Boolean )
                 {
                     return ( (IPrimitiveType) fhirValue ).getValueAsString();
diff --git a/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/r4/R4EnrollmentToCarePlanFhirTransformer.java b/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/r4/R4EnrollmentToCarePlanFhirTransformer.java
new file mode 100644
index 00000000..5c86e92a
--- /dev/null
+++ b/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/r4/R4EnrollmentToCarePlanFhirTransformer.java
@@ -0,0 +1,129 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment.r4;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.dhis2.fhir.adapter.dhis.tracker.program.Enrollment;
+import org.dhis2.fhir.adapter.dhis.tracker.program.EnrollmentStatus;
+import org.dhis2.fhir.adapter.dhis.tracker.program.ProgramMetadataService;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityMetadataService;
+import org.dhis2.fhir.adapter.fhir.data.repository.FhirDhisAssignmentRepository;
+import org.dhis2.fhir.adapter.fhir.extension.IncidentDateExtensionUtils;
+import org.dhis2.fhir.adapter.fhir.extension.LocationExtensionUtils;
+import org.dhis2.fhir.adapter.fhir.metadata.model.EnrollmentRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirClient;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceType;
+import org.dhis2.fhir.adapter.fhir.metadata.model.RuleInfo;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.FhirResourceMappingRepository;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.SystemRepository;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.TrackedEntityRuleRepository;
+import org.dhis2.fhir.adapter.fhir.model.FhirVersion;
+import org.dhis2.fhir.adapter.fhir.repository.FhirResourceRepository;
+import org.dhis2.fhir.adapter.fhir.script.ScriptExecutor;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirTransformerContext;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment.AbstractEnrollmentToCarePlanFhirTransformer;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.ScriptedEnrollment;
+import org.dhis2.fhir.adapter.lock.LockManager;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.r4.model.CanonicalType;
+import org.hl7.fhir.r4.model.CarePlan;
+import org.hl7.fhir.r4.model.Reference;
+import org.hl7.fhir.r4.model.ResourceFactory;
+import org.hl7.fhir.r4.model.UriType;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Nonnull;
+import java.sql.Date;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * R4 specific implementation of {@link AbstractEnrollmentToCarePlanFhirTransformer}.
+ *
+ * @author volsch
+ */
+@Component
+public class R4EnrollmentToCarePlanFhirTransformer extends AbstractEnrollmentToCarePlanFhirTransformer
+{
+    public R4EnrollmentToCarePlanFhirTransformer( @Nonnull ScriptExecutor scriptExecutor, @Nonnull LockManager lockManager, @Nonnull SystemRepository systemRepository, @Nonnull FhirResourceRepository fhirResourceRepository,
+        @Nonnull FhirResourceMappingRepository resourceMappingRepository, @Nonnull FhirDhisAssignmentRepository fhirDhisAssignmentRepository, @Nonnull TrackedEntityMetadataService trackedEntityMetadataService,
+        @Nonnull TrackedEntityRuleRepository trackedEntityRuleRepository, @Nonnull ProgramMetadataService programMetadataService )
+    {
+        super( scriptExecutor, lockManager, systemRepository, fhirResourceRepository, resourceMappingRepository, fhirDhisAssignmentRepository, trackedEntityMetadataService, trackedEntityRuleRepository, programMetadataService );
+    }
+
+    @Nonnull
+    @Override
+    public Set<FhirVersion> getFhirVersions()
+    {
+        return FhirVersion.R4_ONLY;
+    }
+
+    @Override
+    protected boolean transformInternal( @Nonnull FhirClient fhirClient, @Nonnull DhisToFhirTransformerContext context, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull Map<String, Object> scriptVariables,
+        @Nonnull ScriptedEnrollment input, @Nonnull IBaseResource output, @Nonnull IBaseResource trackedEntityResource )
+    {
+        final Enrollment enrollment = (Enrollment) input.getDhisResource();
+        final CarePlan fhirCarePlan = (CarePlan) output;
+        final String planDefinitionUri = FhirResourceType.PLAN_DEFINITION.withId( enrollment.getProgramId() );
+
+        fhirCarePlan.setInstantiatesUri( Collections.singletonList( new UriType( planDefinitionUri ) ) );
+        fhirCarePlan.setInstantiatesCanonical( Collections.singletonList( new CanonicalType( planDefinitionUri ) ) );
+
+        fhirCarePlan.setIntent( CarePlan.CarePlanIntent.PLAN );
+        fhirCarePlan.setStatus( convertStatus( enrollment.getStatus() ) );
+
+        LocationExtensionUtils.setValue( fhirCarePlan,
+            new Reference( FhirResourceType.LOCATION.withId( enrollment.getOrgUnitId() ) ) );
+        fhirCarePlan.setSubject( new Reference( trackedEntityResource.getIdElement() ) );
+
+        fhirCarePlan.setPeriod( null );
+        fhirCarePlan.getPeriod().setStart( Date.from( enrollment.getEnrollmentDate().toInstant() ) );
+        IncidentDateExtensionUtils.setValue( fhirCarePlan, enrollment.getIncidentDate() == null ? null :
+            Date.from( enrollment.getIncidentDate().toInstant() ), ResourceFactory::createType );
+
+        return true;
+    }
+
+    @Nonnull
+    protected CarePlan.CarePlanStatus convertStatus( @Nonnull EnrollmentStatus enrollmentStatus )
+    {
+        switch ( enrollmentStatus )
+        {
+            case ACTIVE:
+                return CarePlan.CarePlanStatus.ACTIVE;
+            case COMPLETED:
+                return CarePlan.CarePlanStatus.COMPLETED;
+            case CANCELLED:
+                return CarePlan.CarePlanStatus.REVOKED;
+            default:
+                throw new AssertionError( "Invalid enrollment status: " + enrollmentStatus );
+        }
+    }
+}
diff --git a/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/r4/R4EnrollmentToFhirDataProvider.java b/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/r4/R4EnrollmentToFhirDataProvider.java
new file mode 100644
index 00000000..9dfb0eff
--- /dev/null
+++ b/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/r4/R4EnrollmentToFhirDataProvider.java
@@ -0,0 +1,75 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment.r4;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.dhis2.fhir.adapter.dhis.tracker.program.EnrollmentService;
+import org.dhis2.fhir.adapter.fhir.extension.LocationExtensionUtils;
+import org.dhis2.fhir.adapter.fhir.metadata.model.EnrollmentRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.RuleInfo;
+import org.dhis2.fhir.adapter.fhir.model.FhirVersion;
+import org.dhis2.fhir.adapter.fhir.script.ScriptExecutor;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment.AbstractEnrollmentToFhirDataProvider;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.search.SearchFilter;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.search.SearchParamType;
+import org.hl7.fhir.r4.model.CarePlan;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Nonnull;
+import java.util.Set;
+
+/**
+ * R4 specific version of {@link AbstractEnrollmentToFhirDataProvider}.
+ *
+ * @author volsch
+ */
+@Component
+public class R4EnrollmentToFhirDataProvider extends AbstractEnrollmentToFhirDataProvider
+{
+    public R4EnrollmentToFhirDataProvider( @Nonnull ScriptExecutor scriptExecutor, @Nonnull EnrollmentService enrollmentService )
+    {
+        super( scriptExecutor, enrollmentService );
+    }
+
+    @Nonnull
+    @Override
+    public Set<FhirVersion> getFhirVersions()
+    {
+        return FhirVersion.R4_ONLY;
+    }
+
+    @Override
+    protected void initSearchFilter( @Nonnull FhirVersion fhirVersion, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull SearchFilter searchFilter )
+    {
+        searchFilter.add( CarePlan.SP_INSTANTIATES_CANONICAL, SearchParamType.REFERENCE, "program" );
+        searchFilter.add( CarePlan.SP_INSTANTIATES_URI, SearchParamType.REFERENCE, "program" );
+        searchFilter.add( CarePlan.SP_PATIENT, SearchParamType.REFERENCE, "trackedEntityInstance" );
+        searchFilter.add( CarePlan.SP_SUBJECT, SearchParamType.REFERENCE, "trackedEntityInstance" );
+        searchFilter.add( LocationExtensionUtils.LOCATION_SEARCH_PARAM, SearchParamType.REFERENCE, "ou" );
+    }
+}
diff --git a/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/util/r4/R4ValueTypeFhirToDhisTransformerUtils.java b/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/util/r4/R4ValueTypeFhirToDhisTransformerUtils.java
index 3d6592b1..a2ccf377 100644
--- a/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/util/r4/R4ValueTypeFhirToDhisTransformerUtils.java
+++ b/fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/util/r4/R4ValueTypeFhirToDhisTransformerUtils.java
@@ -118,6 +118,11 @@ protected Object convert( @Nullable IBaseDatatype fhirValue, @Nonnull ValueType
             case NUMBER:
             case PERCENTAGE:
             case UNIT_INTERVAL:
+                if ( fhirValue.isEmpty() )
+                {
+                    return null;
+                }
+
                 if ( fhirValue instanceof IPrimitiveType && ( (IPrimitiveType) fhirValue ).getValue() instanceof Number )
                 {
                     return ( (IPrimitiveType) fhirValue ).getValueAsString();
@@ -127,6 +132,11 @@ protected Object convert( @Nullable IBaseDatatype fhirValue, @Nonnull ValueType
             case DATETIME:
             case DATE:
             case AGE:
+                if ( fhirValue.isEmpty() )
+                {
+                    return null;
+                }
+
                 if ( fhirValue instanceof DateTimeType )
                 {
                     return DateTimeFormatter.ISO_LOCAL_DATE_TIME
@@ -143,6 +153,11 @@ protected Object convert( @Nullable IBaseDatatype fhirValue, @Nonnull ValueType
                 break;
             case BOOLEAN:
             case TRUE_ONLY:
+                if ( fhirValue.isEmpty() )
+                {
+                    return null;
+                }
+
                 if ( fhirValue instanceof IPrimitiveType && ( (IPrimitiveType) fhirValue ).getValue() instanceof Boolean )
                 {
                     return ( (IPrimitiveType) fhirValue ).getValueAsString();
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtils.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtils.java
index 6811ec79..c39be78a 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtils.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtils.java
@@ -31,10 +31,12 @@
 import ca.uhn.fhir.model.api.IElement;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
+import org.hl7.fhir.instance.model.api.IBaseReference;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Date;
 import java.util.function.Function;
 
 /**
@@ -58,6 +60,33 @@ protected static void setStringValue( @Nonnull String url, @Nonnull IBaseHasExte
         }
     }
 
+    @SuppressWarnings( "unchecked" )
+    protected static void setDateValue( @Nonnull String url, @Nonnull IBaseHasExtensions resource, @Nullable Date value, @Nonnull Function<String, IElement> typeFactory )
+    {
+        resource.getExtension().removeIf( e -> url.equals( e.getUrl() ) );
+
+        if ( value != null )
+        {
+            final IBaseExtension<?, ?> extension = resource.addExtension();
+
+            extension.setUrl( url );
+            extension.setValue( ( (IPrimitiveType<Date>) typeFactory.apply( "date" ) ).setValue( value ) );
+        }
+    }
+
+    protected static void setReferenceValue( @Nonnull String url, @Nonnull IBaseHasExtensions resource, @Nullable IBaseReference value )
+    {
+        resource.getExtension().removeIf( e -> url.equals( e.getUrl() ) );
+
+        if ( value != null )
+        {
+            final IBaseExtension<?, ?> extension = resource.addExtension();
+
+            extension.setUrl( url );
+            extension.setValue( value );
+        }
+    }
+
     private BaseExtensionUtils()
     {
         super();
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/IncidentDateExtensionUtils.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/IncidentDateExtensionUtils.java
new file mode 100644
index 00000000..57cc724a
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/IncidentDateExtensionUtils.java
@@ -0,0 +1,57 @@
+package org.dhis2.fhir.adapter.fhir.extension;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import ca.uhn.fhir.model.api.IElement;
+import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Date;
+import java.util.function.Function;
+
+/**
+ * Utility class to process FHIR incident date extension.
+ *
+ * @author volsch
+ */
+public abstract class IncidentDateExtensionUtils
+{
+    public static final String URL = "http://www.dhis2.org/dhis2-fhir-adapter/fhir/extensions/incident-date";
+
+    public static void setValue( @Nonnull IBaseHasExtensions resource, @Nullable Date date, @Nonnull Function<String, IElement> typeFactory )
+    {
+        BaseExtensionUtils.setDateValue( URL, resource, date, typeFactory );
+    }
+
+    private IncidentDateExtensionUtils()
+    {
+        super();
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/LocationExtensionUtils.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/LocationExtensionUtils.java
new file mode 100644
index 00000000..091c053f
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/extension/LocationExtensionUtils.java
@@ -0,0 +1,57 @@
+package org.dhis2.fhir.adapter.fhir.extension;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
+import org.hl7.fhir.instance.model.api.IBaseReference;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Utility class to process FHIR location extension.
+ *
+ * @author volsch
+ */
+public abstract class LocationExtensionUtils
+{
+    public static final String URL = "http://www.dhis2.org/dhis2-fhir-adapter/fhir/extensions/location";
+
+    public static final String LOCATION_SEARCH_PARAM = "location";
+
+    public static void setValue( @Nonnull IBaseHasExtensions resource, @Nullable IBaseReference locationReference )
+    {
+        BaseExtensionUtils.setReferenceValue( URL, resource, locationReference );
+    }
+
+    private LocationExtensionUtils()
+    {
+        super();
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/FhirResourceType.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/FhirResourceType.java
index 384ae2c0..a4e6cf55 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/FhirResourceType.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/FhirResourceType.java
@@ -195,4 +195,10 @@ public Set<String> getSimpleClassNames()
     {
         return simpleClassNames;
     }
+
+    @Nonnull
+    public String withId( @Nonnull String id )
+    {
+        return resourceTypeName + "/" + id;
+    }
 }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/impl/DhisRepositoryImpl.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/impl/DhisRepositoryImpl.java
index b2c17a31..10ae3105 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/impl/DhisRepositoryImpl.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/impl/DhisRepositoryImpl.java
@@ -252,7 +252,8 @@ protected DhisResource getDhisResource()
         }.read( fhirClient, fhirResourceType );
     }
 
-    @HystrixCommand( ignoreExceptions = { MissingDhisResourceException.class, TransformerDataException.class, TransformerMappingException.class, DhisToFhirDataProviderException.class, UnauthorizedException.class, ForbiddenException.class } )
+    @HystrixCommand( ignoreExceptions = { MissingDhisResourceException.class, TransformerDataException.class, TransformerMappingException.class, DhisToFhirDataProviderException.class, UnauthorizedException.class, ForbiddenException.class,
+        DhisToFhirDataProviderException.class } )
     @Nonnull
     @Override
     public IBundleProvider search( @Nonnull FhirClient fhirClient, @Nonnull FhirResourceType fhirResourceType, @Nullable Integer count, boolean unlimitedCount,
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/AbstractDhisToFhirTransformer.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/AbstractDhisToFhirTransformer.java
index 91e0517c..f627f364 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/AbstractDhisToFhirTransformer.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/AbstractDhisToFhirTransformer.java
@@ -35,6 +35,7 @@
 import org.dhis2.fhir.adapter.fhir.metadata.model.AbstractRule;
 import org.dhis2.fhir.adapter.fhir.metadata.model.ExecutableScript;
 import org.dhis2.fhir.adapter.fhir.metadata.model.FhirClient;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceMapping;
 import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceType;
 import org.dhis2.fhir.adapter.fhir.metadata.model.RuleInfo;
 import org.dhis2.fhir.adapter.fhir.metadata.model.ScriptVariable;
@@ -440,6 +441,56 @@ protected void lockFhirIdentifier( @Nonnull DhisToFhirTransformerContext context
         }
     }
 
+    protected boolean transformFhirResourceType( @Nonnull DhisToFhirTransformerContext context, @Nonnull RuleInfo<U> ruleInfo, @Nonnull Map<String, Object> variables, @Nonnull FhirResourceMapping resourceMapping,
+        @Nonnull ScriptedDhisResource input, @Nonnull IBaseResource output )
+    {
+        if ( context.getDhisRequest().isCompleteTransformation() )
+        {
+            if ( ( resourceMapping.getExpStatusTransformScript() != null ) &&
+                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpStatusTransformScript(), variables, Boolean.class ) ) )
+            {
+                logger.info( "Resulting DHIS status could not be transformed into FHIR resource {} with type {}.",
+                    output.getIdElement().toUnqualifiedVersionless(), resourceMapping.getFhirResourceType() );
+
+                return false;
+            }
+
+            if ( ( resourceMapping.getExpTeiTransformScript() != null ) &&
+                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpTeiTransformScript(), variables, Boolean.class ) ) )
+            {
+                logger.info( "Resulting DHIS TEI could not be transformed into FHIR resource {}.",
+                    resourceMapping.getFhirResourceType() );
+
+                return false;
+            }
+
+            if ( ( resourceMapping.getExpOrgUnitTransformScript() != null ) &&
+                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpOrgUnitTransformScript(), variables, Boolean.class ) ) )
+            {
+                logger.info( "DHIS Organization Unit {} could not be transformed into FHIR resource {}.",
+                    input.getOrganizationUnitId(), resourceMapping.getFhirResourceType() );
+
+                return false;
+            }
+
+            if ( ( resourceMapping.getExpGeoTransformScript() != null ) &&
+                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpGeoTransformScript(), variables, Boolean.class ) ) )
+            {
+                return false;
+            }
+
+            if ( ( resourceMapping.getExpDateTransformScript() != null ) &&
+                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpDateTransformScript(), variables, Boolean.class ) ) )
+            {
+                logger.info( "Date could not be transformed into FHIR resource {}.",
+                    resourceMapping.getFhirResourceType() );
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     protected Optional<? extends IBaseResource> getTrackedEntityFhirResource( @Nonnull FhirClient fhirClient, @Nonnull DhisToFhirTransformerContext context,
         @Nonnull RuleInfo<TrackedEntityRule> ruleInfo, @Nonnull FhirResourceType trackedEntityResourceType,
         @Nonnull ScriptedTrackedEntityInstance scriptedTrackedEntityInstance, @Nonnull Map<String, Object> scriptVariables ) throws TransformerException
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/AbstractEnrollmentToCarePlanFhirTransformer.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/AbstractEnrollmentToCarePlanFhirTransformer.java
new file mode 100644
index 00000000..3d1908f9
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/AbstractEnrollmentToCarePlanFhirTransformer.java
@@ -0,0 +1,255 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
+import org.dhis2.fhir.adapter.dhis.model.Reference;
+import org.dhis2.fhir.adapter.dhis.tracker.program.Program;
+import org.dhis2.fhir.adapter.dhis.tracker.program.ProgramMetadataService;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityMetadataService;
+import org.dhis2.fhir.adapter.fhir.data.repository.FhirDhisAssignmentRepository;
+import org.dhis2.fhir.adapter.fhir.metadata.model.EnrollmentRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.ExecutableScript;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirClient;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceMapping;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceType;
+import org.dhis2.fhir.adapter.fhir.metadata.model.RuleInfo;
+import org.dhis2.fhir.adapter.fhir.metadata.model.ScriptVariable;
+import org.dhis2.fhir.adapter.fhir.metadata.model.TrackedEntityRule;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.FhirResourceMappingRepository;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.SystemRepository;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.TrackedEntityRuleRepository;
+import org.dhis2.fhir.adapter.fhir.repository.FhirResourceRepository;
+import org.dhis2.fhir.adapter.fhir.repository.MissingDhisResourceException;
+import org.dhis2.fhir.adapter.fhir.script.ScriptExecutor;
+import org.dhis2.fhir.adapter.fhir.transform.FatalTransformerException;
+import org.dhis2.fhir.adapter.fhir.transform.TransformerException;
+import org.dhis2.fhir.adapter.fhir.transform.TransformerMappingException;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirTransformOutcome;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirTransformerContext;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.AbstractDhisToFhirTransformer;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.DhisToFhirTransformer;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.metadata.program.ProgramTrackedEntityTypeUtils;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.ScriptedEnrollment;
+import org.dhis2.fhir.adapter.fhir.transform.util.TransformerUtils;
+import org.dhis2.fhir.adapter.lock.LockManager;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Implementation of {@link DhisToFhirTransformer} for transforming DHIS2
+ * Enrollment to FHIR Care Plan.
+ *
+ * @author volsch
+ */
+public abstract class AbstractEnrollmentToCarePlanFhirTransformer extends AbstractDhisToFhirTransformer<ScriptedEnrollment, EnrollmentRule>
+{
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
+
+    private final FhirResourceMappingRepository resourceMappingRepository;
+
+    private final TrackedEntityMetadataService trackedEntityMetadataService;
+
+    private final TrackedEntityRuleRepository trackedEntityRuleRepository;
+
+    private final ProgramMetadataService programMetadataService;
+
+    public AbstractEnrollmentToCarePlanFhirTransformer( @Nonnull ScriptExecutor scriptExecutor, @Nonnull LockManager lockManager, @Nonnull SystemRepository systemRepository, @Nonnull FhirResourceRepository fhirResourceRepository,
+        @Nonnull FhirResourceMappingRepository resourceMappingRepository, @Nonnull FhirDhisAssignmentRepository fhirDhisAssignmentRepository,
+        @Nonnull TrackedEntityMetadataService trackedEntityMetadataService, @Nonnull TrackedEntityRuleRepository trackedEntityRuleRepository,
+        @Nonnull ProgramMetadataService programMetadataService )
+    {
+        super( scriptExecutor, lockManager, systemRepository, fhirResourceRepository, fhirDhisAssignmentRepository );
+
+        this.resourceMappingRepository = resourceMappingRepository;
+        this.trackedEntityMetadataService = trackedEntityMetadataService;
+        this.trackedEntityRuleRepository = trackedEntityRuleRepository;
+        this.programMetadataService = programMetadataService;
+    }
+
+    @Nonnull
+    @Override
+    public DhisResourceType getDhisResourceType()
+    {
+        return DhisResourceType.ENROLLMENT;
+    }
+
+    @Nonnull
+    @Override
+    public Class<ScriptedEnrollment> getDhisResourceClass()
+    {
+        return ScriptedEnrollment.class;
+    }
+
+    @Nonnull
+    @Override
+    public Class<EnrollmentRule> getRuleClass()
+    {
+        return EnrollmentRule.class;
+    }
+
+    @Nullable
+    @Override
+    public DhisToFhirTransformOutcome<? extends IBaseResource> transform(
+        @Nonnull FhirClient fhirClient, @Nonnull DhisToFhirTransformerContext context, @Nonnull ScriptedEnrollment input,
+        @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull Map<String, Object> scriptVariables ) throws TransformerException
+    {
+        if ( ruleInfo.getRule().getFhirResourceType() != FhirResourceType.CARE_PLAN )
+        {
+            return null;
+        }
+
+        final Map<String, Object> variables = new HashMap<>( scriptVariables );
+
+        final Program program = programMetadataService.findMetadataByReference( Reference.createIdReference( Objects.requireNonNull( input.getProgramId() ) ) )
+            .orElseThrow( () -> new TransformerMappingException( "Program " + input.getProgramId() + " could not be found." ) );
+
+        final TrackedEntityRule trackedEntityRule = getTrackedEntityRule( program );
+
+        if ( trackedEntityRule == null )
+        {
+            return null;
+        }
+
+        final FhirResourceMapping resourceMapping = getResourceMapping( ruleInfo, trackedEntityRule.getFhirResourceType() );
+
+        final IBaseResource trackedEntityFhirResource = getTrackedEntityFhirResource( fhirClient, context,
+            new RuleInfo<>( trackedEntityRule, Collections.emptyList() ), trackedEntityRule.getFhirResourceType(),
+            Objects.requireNonNull( input.getTrackedEntityInstance() ), variables ).orElseThrow(
+            () -> new MissingDhisResourceException( Objects.requireNonNull( input.getTrackedEntityInstance().getResourceId() ) ) );
+        variables.put( ScriptVariable.TEI_FHIR_RESOURCE.getVariableName(), trackedEntityFhirResource );
+
+        final IBaseResource resource = getResource( fhirClient, context, ruleInfo, variables ).orElse( null );
+
+        if ( resource == null )
+        {
+            return null;
+        }
+
+        final IBaseResource modifiedResource = cloneToModified( context, ruleInfo, resource, variables );
+
+        if ( modifiedResource == null )
+        {
+            return null;
+        }
+
+        variables.put( ScriptVariable.OUTPUT.getVariableName(), modifiedResource );
+
+        if ( !transformInternal( fhirClient, context, ruleInfo, scriptVariables, input, modifiedResource, trackedEntityFhirResource ) )
+        {
+            return null;
+        }
+
+        if ( !transformFhirResourceType( context, ruleInfo, variables, resourceMapping, input, modifiedResource ) )
+        {
+            return null;
+        }
+
+        if ( !transform( context, ruleInfo, variables ) )
+        {
+            return null;
+        }
+
+        return createResult( context, ruleInfo, variables, resource, modifiedResource );
+    }
+
+    @Nonnull
+    private DhisToFhirTransformOutcome<? extends IBaseResource> createResult( @Nonnull DhisToFhirTransformerContext context, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull Map<String, Object> variables,
+        @Nonnull IBaseResource resource, @Nonnull IBaseResource modifiedResource )
+    {
+        if ( !context.getDhisRequest().isDhisFhirId() && evaluateNotModified( context, variables, resource, modifiedResource ) )
+        {
+            // resource has not been changed and do not need to be updated
+            return new DhisToFhirTransformOutcome<>( ruleInfo.getRule(), null );
+        }
+
+        return new DhisToFhirTransformOutcome<>( ruleInfo.getRule(), modifiedResource );
+    }
+
+    protected boolean transformInternal( @Nonnull FhirClient fhirClient, @Nonnull DhisToFhirTransformerContext context, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull Map<String, Object> scriptVariables,
+        @Nonnull ScriptedEnrollment input, @Nonnull IBaseResource output, @Nonnull IBaseResource trackedEntityResource )
+    {
+        // method can be overridden
+        return true;
+    }
+
+    @Nonnull
+    @Override
+    protected Optional<? extends IBaseResource> getActiveResource( @Nonnull FhirClient fhirClient, @Nonnull DhisToFhirTransformerContext context, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull Map<String, Object> scriptVariables ) throws TransformerException
+    {
+        return Optional.empty();
+    }
+
+    @Override
+    protected void lockResource( @Nonnull FhirClient fhirClient, @Nonnull DhisToFhirTransformerContext context, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull Map<String, Object> scriptVariables ) throws TransformerException
+    {
+        if ( !context.getDhisRequest().isDhisFhirId() )
+        {
+            final ScriptedEnrollment scriptedEnrollment = TransformerUtils.getScriptVariable(
+                scriptVariables, ScriptVariable.INPUT, ScriptedEnrollment.class );
+
+            if ( scriptedEnrollment.getId() != null )
+            {
+                final String lockKey = "out-en:" + scriptedEnrollment.getId();
+                getLockManager().getCurrentLockContext().orElseThrow( () -> new FatalTransformerException( "No lock context available." ) ).lock( lockKey );
+            }
+        }
+    }
+
+    @Nullable
+    @Override
+    protected String getIdentifierValue( @Nonnull DhisToFhirTransformerContext context, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nullable ExecutableScript identifierLookupScript,
+        @Nonnull ScriptedEnrollment scriptedDhisResource, @Nonnull Map<String, Object> scriptVariables )
+    {
+        // for enrollments no identifier value can be created
+        return null;
+    }
+
+    @Nonnull
+    protected FhirResourceMapping getResourceMapping( @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull FhirResourceType trackedEntityFhirResourceType )
+    {
+        return resourceMappingRepository.findOneByFhirResourceType( ruleInfo.getRule().getFhirResourceType(), trackedEntityFhirResourceType )
+            .orElseThrow( () -> new FatalTransformerException( "No FHIR resource mapping has been defined for " + ruleInfo.getRule().getFhirResourceType() + "." ) );
+    }
+
+    @Nullable
+    protected TrackedEntityRule getTrackedEntityRule( @Nonnull Program program )
+    {
+        return ProgramTrackedEntityTypeUtils.getTrackedEntityRule( trackedEntityMetadataService, trackedEntityRuleRepository, program ).orElse( null );
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/AbstractEnrollmentToFhirDataProvider.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/AbstractEnrollmentToFhirDataProvider.java
new file mode 100644
index 00000000..021ec589
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/AbstractEnrollmentToFhirDataProvider.java
@@ -0,0 +1,136 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import ca.uhn.fhir.rest.param.DateRangeParam;
+import org.dhis2.fhir.adapter.dhis.DhisFindException;
+import org.dhis2.fhir.adapter.dhis.model.DhisResource;
+import org.dhis2.fhir.adapter.dhis.model.DhisResourceResult;
+import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
+import org.dhis2.fhir.adapter.dhis.tracker.program.Enrollment;
+import org.dhis2.fhir.adapter.dhis.tracker.program.EnrollmentService;
+import org.dhis2.fhir.adapter.fhir.metadata.model.EnrollmentRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirClient;
+import org.dhis2.fhir.adapter.fhir.metadata.model.RuleInfo;
+import org.dhis2.fhir.adapter.fhir.model.FhirVersion;
+import org.dhis2.fhir.adapter.fhir.script.ScriptExecutor;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirDataProvider;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirDataProviderException;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirSearchResult;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirSearchState;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.PreparedDhisToFhirSearch;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.AbstractDhisToFhirDataProvider;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.metadata.DhisMetadataToFhirSearchState;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Implementation of {@link DhisToFhirDataProvider} for DHIS2 Enrollments.
+ *
+ * @author volsch
+ */
+public abstract class AbstractEnrollmentToFhirDataProvider extends AbstractDhisToFhirDataProvider<EnrollmentRule>
+{
+    private final EnrollmentService enrollmentService;
+
+    public AbstractEnrollmentToFhirDataProvider( @Nonnull ScriptExecutor scriptExecutor, @Nonnull EnrollmentService enrollmentService )
+    {
+        super( scriptExecutor, false );
+
+        this.enrollmentService = enrollmentService;
+    }
+
+    @Nonnull
+    @Override
+    public DhisResourceType getDhisResourceType()
+    {
+        return DhisResourceType.ENROLLMENT;
+    }
+
+    @Nonnull
+    @Override
+    protected Class<EnrollmentRule> getRuleClass()
+    {
+        return EnrollmentRule.class;
+    }
+
+    @Nullable
+    @Override
+    public DhisResource findByDhisFhirIdentifier( @Nonnull FhirClient fhirClient, @Nonnull RuleInfo<EnrollmentRule> ruleInfo, @Nonnull String identifier )
+    {
+        // finding by identifier is not supported
+        return null;
+    }
+
+    @Nonnull
+    @Override
+    public PreparedDhisToFhirSearch prepareSearch( @Nonnull FhirVersion fhirVersion, @Nonnull List<RuleInfo<EnrollmentRule>> ruleInfos, @Nullable Map<String, List<String>> filter, @Nullable DateRangeParam lastUpdatedDateRange, int count ) throws DhisToFhirDataProviderException
+    {
+        final PreparedEnrollmentToFhirSearch ps = new PreparedEnrollmentToFhirSearch( fhirVersion, ruleInfos, filter, lastUpdatedDateRange, count );
+        ps.setUriFilterApplier( apply( fhirVersion, ruleInfos, ps.createSearchFilterCollector( null ) ) );
+
+        return ps;
+    }
+
+    @Nullable
+    @Override
+    public DhisToFhirSearchResult<? extends DhisResource> search( @Nonnull PreparedDhisToFhirSearch preparedSearch, @Nullable DhisToFhirSearchState state, int max )
+    {
+        final PreparedEnrollmentToFhirSearch ps = (PreparedEnrollmentToFhirSearch) preparedSearch;
+        final DhisMetadataToFhirSearchState ss = (DhisMetadataToFhirSearchState) state;
+
+        if ( ss != null && !ss.isMore() )
+        {
+            return null;
+        }
+
+        final int from = ( ss == null ) ? 0 : ss.getFrom();
+        final DhisResourceResult<Enrollment> result;
+
+        try
+        {
+            result = enrollmentService.find( ps, from, max );
+        }
+        catch ( DhisFindException e )
+        {
+            throw new DhisToFhirDataProviderException( e.getMessage(), e );
+        }
+
+        if ( result.getResources().isEmpty() )
+        {
+            return null;
+        }
+
+        return new DhisToFhirSearchResult<>( result.getResources(), new DhisMetadataToFhirSearchState( from + result.getResources().size(),
+            !result.getResources().isEmpty() && result.isMore() ) );
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/EnrollmentToFhirRequestResolver.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/EnrollmentToFhirRequestResolver.java
new file mode 100644
index 00000000..3346e2ae
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/EnrollmentToFhirRequestResolver.java
@@ -0,0 +1,146 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.dhis2.fhir.adapter.dhis.converter.ValueConverter;
+import org.dhis2.fhir.adapter.dhis.model.DhisResource;
+import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
+import org.dhis2.fhir.adapter.dhis.model.Reference;
+import org.dhis2.fhir.adapter.dhis.model.ReferenceType;
+import org.dhis2.fhir.adapter.dhis.tracker.program.Enrollment;
+import org.dhis2.fhir.adapter.dhis.tracker.program.Program;
+import org.dhis2.fhir.adapter.dhis.tracker.program.ProgramMetadataService;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityAttributes;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityMetadataService;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityService;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityType;
+import org.dhis2.fhir.adapter.fhir.metadata.model.AbstractRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.EnrollmentRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.RuleInfo;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.FhirClientRepository;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.ProgramStageRuleRepository;
+import org.dhis2.fhir.adapter.fhir.script.ScriptExecutionContext;
+import org.dhis2.fhir.adapter.fhir.transform.TransformerDataException;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.AbstractDhisToFhirRequestResolver;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.DhisToFhirRequestResolver;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.model.DhisRequest;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.ImmutableScriptedEnrollment;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.ImmutableScriptedTrackedEntityInstance;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.ScriptedDhisResource;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.ScriptedEvent;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.ScriptedTrackedEntityInstance;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.WritableScriptedEnrollment;
+import org.dhis2.fhir.adapter.fhir.transform.scripted.WritableScriptedTrackedEntityInstance;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Implementation of {@link DhisToFhirRequestResolver} for enrollments.
+ *
+ * @author volsch
+ */
+@Component
+public class EnrollmentToFhirRequestResolver extends AbstractDhisToFhirRequestResolver
+{
+    private final ProgramMetadataService programMetadataService;
+
+    private final ProgramStageRuleRepository ruleRepository;
+
+    private final TrackedEntityService trackedEntityService;
+
+    private final TrackedEntityMetadataService trackedEntityMetadataService;
+
+    private final ScriptExecutionContext scriptExecutionContext;
+
+    private final ValueConverter valueConverter;
+
+    public EnrollmentToFhirRequestResolver(
+        @Nonnull FhirClientRepository fhirClientRepository,
+        @Nonnull ProgramMetadataService programMetadataService,
+        @Nonnull ProgramStageRuleRepository ruleRepository,
+        @Nonnull TrackedEntityService trackedEntityService,
+        @Nonnull TrackedEntityMetadataService trackedEntityMetadataService,
+        @Nonnull ScriptExecutionContext scriptExecutionContext,
+        @Nonnull ValueConverter valueConverter )
+    {
+        super( fhirClientRepository );
+
+        this.programMetadataService = programMetadataService;
+        this.ruleRepository = ruleRepository;
+        this.trackedEntityService = trackedEntityService;
+        this.trackedEntityMetadataService = trackedEntityMetadataService;
+        this.scriptExecutionContext = scriptExecutionContext;
+        this.valueConverter = valueConverter;
+    }
+
+    @Nonnull
+    @Override
+    public DhisResourceType getDhisResourceType()
+    {
+        return DhisResourceType.ENROLLMENT;
+    }
+
+    @Nonnull
+    @Override
+    public List<RuleInfo<? extends AbstractRule>> resolveRules( @Nonnull ScriptedDhisResource dhisResource )
+    {
+        final ScriptedEvent event = (ScriptedEvent) dhisResource;
+        return ruleRepository.findAllExp( event.getProgram().getAllReferences(), event.getProgramStage().getAllReferences(), null )
+            .stream().sorted().collect( Collectors.toList() );
+    }
+
+    @Nonnull
+    @Override
+    public List<RuleInfo<? extends AbstractRule>> resolveRules( @Nonnull ScriptedDhisResource dhisResource, @Nonnull List<RuleInfo<? extends AbstractRule>> rules )
+    {
+        return rules.stream().map( ri -> new RuleInfo<>( (EnrollmentRule) ri.getRule(), ri.getDhisDataReferences() ) )
+            .sorted().collect( Collectors.toList() );
+    }
+
+    @Nonnull
+    @Override
+    public ScriptedDhisResource convert( @Nonnull DhisResource dhisResource, @Nonnull DhisRequest dhisRequest )
+    {
+        final Enrollment enrollment = (Enrollment) dhisResource;
+
+        final Program program = programMetadataService.findMetadataByReference( new Reference( enrollment.getProgramId(), ReferenceType.ID ) )
+            .orElseThrow( () -> new TransformerDataException( "Program " + enrollment.getProgramId() + " of enrollment " + enrollment.getId() + " could not be found." ) );
+        final TrackedEntityType trackedEntityType = trackedEntityMetadataService.findTypeByReference( Reference.createIdReference( program.getTrackedEntityTypeId() ) )
+            .orElseThrow( () -> new TransformerDataException( "Tracked entity type " + program.getTrackedEntityTypeId() + " of program " + program.getId() + "." ) );
+
+        final TrackedEntityAttributes trackedEntityAttributes = trackedEntityMetadataService.getAttributes();
+        final ScriptedTrackedEntityInstance scriptedTrackedEntityInstance = new ImmutableScriptedTrackedEntityInstance( new WritableScriptedTrackedEntityInstance(
+            trackedEntityMetadataService, trackedEntityService, trackedEntityAttributes, trackedEntityType, enrollment.getTrackedEntityInstanceId(), scriptExecutionContext, valueConverter ) );
+
+        return new ImmutableScriptedEnrollment( new WritableScriptedEnrollment( program, enrollment, scriptedTrackedEntityInstance, scriptExecutionContext, valueConverter ) );
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/EnrollmentToFhirSearchState.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/EnrollmentToFhirSearchState.java
new file mode 100644
index 00000000..0306a5c7
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/EnrollmentToFhirSearchState.java
@@ -0,0 +1,71 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.dhis2.fhir.adapter.dhis.tracker.program.ProgramStageId;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirSearchState;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Implementation of {@link DhisToFhirSearchState} for enrollments.
+ *
+ * @author volsch
+ */
+public class EnrollmentToFhirSearchState implements DhisToFhirSearchState
+{
+    private final ProgramStageId programStageId;
+
+    private final int from;
+
+    private final boolean more;
+
+    public EnrollmentToFhirSearchState( @Nonnull ProgramStageId programStageId, int from, boolean more )
+    {
+        this.programStageId = programStageId;
+        this.from = from;
+        this.more = more;
+    }
+
+    @Nonnull
+    public ProgramStageId getProgramStageId()
+    {
+        return programStageId;
+    }
+
+    public int getFrom()
+    {
+        return from;
+    }
+
+    public boolean isMore()
+    {
+        return more;
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/PreparedEnrollmentToFhirSearch.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/PreparedEnrollmentToFhirSearch.java
new file mode 100644
index 00000000..894e293e
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/enrollment/PreparedEnrollmentToFhirSearch.java
@@ -0,0 +1,54 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.enrollment;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import ca.uhn.fhir.rest.param.DateRangeParam;
+import org.dhis2.fhir.adapter.fhir.metadata.model.EnrollmentRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.RuleInfo;
+import org.dhis2.fhir.adapter.fhir.model.FhirVersion;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.PreparedDhisToFhirSearch;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.AbstractPreparedDhisToFhirSearch;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Implementation of {@link PreparedDhisToFhirSearch} for DHIS2 enrollments.
+ *
+ * @author volsch
+ */
+public class PreparedEnrollmentToFhirSearch extends AbstractPreparedDhisToFhirSearch<EnrollmentRule>
+{
+    public PreparedEnrollmentToFhirSearch( @Nonnull FhirVersion fhirVersion, @Nonnull List<RuleInfo<EnrollmentRule>> ruleInfos, @Nullable Map<String, List<String>> filter, @Nullable DateRangeParam lastUpdatedDateRange, int count )
+    {
+        super( fhirVersion, ruleInfos, filter, lastUpdatedDateRange, count );
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/AbstractProgramMetadataToFhirPlanDefinitionTransformer.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/AbstractProgramMetadataToFhirPlanDefinitionTransformer.java
index a2b48af7..270e661a 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/AbstractProgramMetadataToFhirPlanDefinitionTransformer.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/AbstractProgramMetadataToFhirPlanDefinitionTransformer.java
@@ -30,15 +30,11 @@
 
 import ca.uhn.fhir.model.api.IElement;
 import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
-import org.dhis2.fhir.adapter.dhis.model.Reference;
-import org.dhis2.fhir.adapter.dhis.model.ReferenceType;
 import org.dhis2.fhir.adapter.dhis.orgunit.OrganizationUnitService;
 import org.dhis2.fhir.adapter.dhis.tracker.program.Program;
 import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityMetadataService;
-import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityType;
 import org.dhis2.fhir.adapter.fhir.data.repository.FhirDhisAssignmentRepository;
 import org.dhis2.fhir.adapter.fhir.extension.ResourceTypeExtensionUtils;
-import org.dhis2.fhir.adapter.fhir.metadata.model.AbstractRule;
 import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceType;
 import org.dhis2.fhir.adapter.fhir.metadata.model.ProgramMetadataRule;
 import org.dhis2.fhir.adapter.fhir.metadata.repository.SystemRepository;
@@ -113,32 +109,12 @@ public Class<ProgramMetadataRule> getRuleClass()
 
     protected boolean addSubjectResourceType( @Nonnull Program program, @Nonnull IBaseHasExtensions resource )
     {
-        if ( program.getTrackedEntityTypeId() == null )
-        {
-            ResourceTypeExtensionUtils.setValue( resource, null, getTypeFactory() );
-
-            return true;
-        }
-
-        final TrackedEntityType trackedEntityType = trackedEntityMetadataService.findTypeByReference(
-            new Reference( program.getTrackedEntityTypeId(), ReferenceType.ID ) ).orElse( null );
-
-        if ( trackedEntityType == null )
-        {
-            return false;
-        }
-
-        final FhirResourceType fhirResourceType = trackedEntityRuleRepository.findByTypeRefs( trackedEntityType.getAllReferences() ).stream()
-            .sorted( ( o1, o2 ) -> o2.getEvaluationOrder() - o1.getEvaluationOrder() ).map( AbstractRule::getFhirResourceType ).findFirst().orElse( null );
-
-        if ( fhirResourceType == null )
-        {
-            return false;
-        }
+        final FhirResourceType fhirResourceType = ProgramTrackedEntityTypeUtils.getTrackedEntityFhirResourceType(
+            trackedEntityMetadataService, trackedEntityRuleRepository, program );
 
         ResourceTypeExtensionUtils.setValue( resource, fhirResourceType, getTypeFactory() );
 
-        return true;
+        return program.getTrackedEntityTypeId() == null || fhirResourceType != null;
     }
 
     @Nonnull
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/ProgramTrackedEntityTypeUtils.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/ProgramTrackedEntityTypeUtils.java
new file mode 100644
index 00000000..b26804eb
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/ProgramTrackedEntityTypeUtils.java
@@ -0,0 +1,87 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.metadata.program;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.dhis2.fhir.adapter.dhis.model.Reference;
+import org.dhis2.fhir.adapter.dhis.model.ReferenceType;
+import org.dhis2.fhir.adapter.dhis.tracker.program.Program;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityMetadataService;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityType;
+import org.dhis2.fhir.adapter.fhir.metadata.model.AbstractRule;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceType;
+import org.dhis2.fhir.adapter.fhir.metadata.model.TrackedEntityRule;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.TrackedEntityRuleRepository;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Optional;
+
+/**
+ * Utility class to extract tracked entity FHIR resource type from program.
+ *
+ * @author volsch
+ */
+public abstract class ProgramTrackedEntityTypeUtils
+{
+    @Nonnull
+    public static Optional<TrackedEntityRule> getTrackedEntityRule(
+        @Nonnull TrackedEntityMetadataService trackedEntityMetadataService,
+        @Nonnull TrackedEntityRuleRepository trackedEntityRuleRepository,
+        @Nonnull Program program )
+    {
+        if ( program.getTrackedEntityTypeId() == null )
+        {
+            return Optional.empty();
+        }
+
+        final TrackedEntityType trackedEntityType = trackedEntityMetadataService.findTypeByReference(
+            new Reference( program.getTrackedEntityTypeId(), ReferenceType.ID ) ).orElse( null );
+
+        if ( trackedEntityType == null )
+        {
+            return Optional.empty();
+        }
+
+        return trackedEntityRuleRepository.findByTypeRefs( trackedEntityType.getAllReferences() ).stream().min( ( o1, o2 ) -> o2.getEvaluationOrder() - o1.getEvaluationOrder() );
+    }
+
+    @Nullable
+    public static FhirResourceType getTrackedEntityFhirResourceType(
+        @Nonnull TrackedEntityMetadataService trackedEntityMetadataService,
+        @Nonnull TrackedEntityRuleRepository trackedEntityRuleRepository,
+        @Nonnull Program program )
+    {
+        return getTrackedEntityRule( trackedEntityMetadataService, trackedEntityRuleRepository, program ).map( AbstractRule::getFhirResourceType ).orElse( null );
+    }
+
+    private ProgramTrackedEntityTypeUtils()
+    {
+        super();
+    }
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/program/ProgramStageToFhirTransformer.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/program/ProgramStageToFhirTransformer.java
index 980401ed..bbb65b92 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/program/ProgramStageToFhirTransformer.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/program/ProgramStageToFhirTransformer.java
@@ -166,46 +166,13 @@ public DhisToFhirTransformOutcome<? extends IBaseResource> transform(
             return handleDataDelete( fhirClient, context, ruleInfo, resourceMapping, modifiedResource, variables );
         }
 
-        if ( context.getDhisRequest().isCompleteTransformation() )
+        if ( !transformFhirResourceType( context, ruleInfo, variables, resourceMapping, input, modifiedResource ) )
         {
-            if ( (resourceMapping.getExpStatusTransformScript() != null) &&
-                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpStatusTransformScript(), variables, Boolean.class ) ) )
-            {
-                logger.info( "Resulting DHIS status could not be transformed into FHIR resource {} with type {}.",
-                    trackedEntityFhirResource.getIdElement().toUnqualifiedVersionless(), resourceMapping.getFhirResourceType() );
-                return null;
-            }
-
-            if ( (resourceMapping.getExpTeiTransformScript() != null) &&
-                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpTeiTransformScript(), variables, Boolean.class ) ) )
-            {
-                logger.info( "Resulting DHIS TEI {} could not be transformed into FHIR resource {}.",
-                    trackedEntityFhirResource.getIdElement().toUnqualifiedVersionless(), resourceMapping.getFhirResourceType() );
-                return null;
-            }
-
-            if ( (resourceMapping.getExpOrgUnitTransformScript() != null) &&
-                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpOrgUnitTransformScript(), variables, Boolean.class ) ) )
-            {
-                logger.info( "DHIS Organization Unit {} could not be transformed into FHIR resource {}.",
-                    input.getOrganizationUnitId(), resourceMapping.getFhirResourceType() );
-                return null;
-            }
-
-            if ( (resourceMapping.getExpGeoTransformScript() != null) &&
-                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpGeoTransformScript(), variables, Boolean.class ) ) )
-            {
-                return null;
-            }
-
-            if ( (resourceMapping.getExpDateTransformScript() != null) &&
-                !Boolean.TRUE.equals( executeScript( context, ruleInfo, resourceMapping.getExpDateTransformScript(), variables, Boolean.class ) ) )
-            {
-                logger.info( "Event date could not be transformed into FHIR resource {}.",
-                    resourceMapping.getFhirResourceType() );
-                return null;
-            }
+            return null;
+        }
 
+        if ( context.getDhisRequest().isCompleteTransformation() )
+        {
             TransformerUtils.getScriptVariable( scriptVariables, ScriptVariable.CODE_UTILS, AbstractCodeDhisToFhirTransformerUtils.class )
                 .setRuleCodeableConcept( ruleInfo, resource );
         }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToEnrollmentTransformer.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToEnrollmentTransformer.java
index 57e0148d..584b19b0 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToEnrollmentTransformer.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToEnrollmentTransformer.java
@@ -251,7 +251,7 @@ public FhirToDhisTransformOutcome<Enrollment> transform( @Nonnull FhirClientReso
         final Program program = TransformerUtils.getScriptVariable( variables, ScriptVariable.PROGRAM, Program.class );
 
         final WritableScriptedEnrollment scriptedEnrollment = new WritableScriptedEnrollment(
-            program, enrollment, scriptedTrackedEntityInstance, valueConverter );
+            program, enrollment, scriptedTrackedEntityInstance, scriptExecutionContext, valueConverter );
         variables.put( ScriptVariable.OUTPUT.getVariableName(), scriptedEnrollment );
 
         if ( !transform( context, ruleInfo, variables ) )
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToProgramStageTransformer.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToProgramStageTransformer.java
index 39ebbcaf..5ecb19fa 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToProgramStageTransformer.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/fhir/impl/program/FhirToProgramStageTransformer.java
@@ -224,7 +224,7 @@ public FhirToDhisTransformOutcome<Event> transform( @Nonnull FhirClientResource
         final List<WritableScriptedEvent> scriptedProgramStageEvents = createScriptedProgramStageEvents( context, program, programStage, event.getEnrollment().getEvents(), scriptedTrackedEntityInstance );
         variables.put( ScriptVariable.PROGRAM_STAGE_EVENTS.getVariableName(), scriptedProgramStageEvents );
 
-        final WritableScriptedEnrollment scriptedEnrollment = new WritableScriptedEnrollment( program, event.getEnrollment(), scriptedTrackedEntityInstance, valueConverter );
+        final WritableScriptedEnrollment scriptedEnrollment = new WritableScriptedEnrollment( program, event.getEnrollment(), scriptedTrackedEntityInstance, scriptExecutionContext, valueConverter );
         variables.put( ScriptVariable.ENROLLMENT.getVariableName(), scriptedEnrollment );
         if ( !event.isNewResource() && !beforeEnrollmentEvent( context, ruleInfo, programStage, event.getEnrollment(), scriptVariables ) )
         {
@@ -634,7 +634,7 @@ private Map<String, Object> createResourceVariables( @Nonnull FhirToDhisTransfor
         final Map<String, Object> variables = new HashMap<>( scriptVariables );
         final Program program = eventInfo.getProgram();
         final ProgramStage programStage = eventInfo.getProgramStage();
-        final WritableScriptedEnrollment scriptedEnrollment = new WritableScriptedEnrollment( program, enrollment, scriptedTrackedEntityInstance, valueConverter );
+        final WritableScriptedEnrollment scriptedEnrollment = new WritableScriptedEnrollment( program, enrollment, scriptedTrackedEntityInstance, scriptExecutionContext, valueConverter );
         final List<WritableScriptedEvent> scriptedProgramStageEvents = createScriptedProgramStageEvents( context, program, programStage, enrollment.getEvents(), scriptedTrackedEntityInstance );
         variables.put( ScriptVariable.ENROLLMENT.getVariableName(), scriptedEnrollment );
         variables.put( ScriptVariable.PROGRAM_STAGE_EVENTS.getVariableName(), scriptedProgramStageEvents );
@@ -752,7 +752,7 @@ protected Enrollment createEnrollment( @Nonnull FhirToDhisTransformerContext con
         enrollment.setOrgUnitId( organisationUnit.get().getId() );
         enrollment.setEnrollmentDate( enrollmentDate );
 
-        final WritableScriptedEnrollment scriptedEnrollment = new WritableScriptedEnrollment( program, enrollment, scriptedTrackedEntityInstance, valueConverter );
+        final WritableScriptedEnrollment scriptedEnrollment = new WritableScriptedEnrollment( program, enrollment, scriptedTrackedEntityInstance, scriptExecutionContext, valueConverter );
         variables.put( ScriptVariable.ENROLLMENT.getVariableName(), scriptedEnrollment );
 
         if ( (mappedProgram.getCreationScript() != null) &&
@@ -928,7 +928,7 @@ protected Optional<OrganizationUnit> getEventOrgUnit( @Nonnull FhirToDhisTransfo
         final Program program = TransformerUtils.getScriptVariable( scriptVariables, ScriptVariable.PROGRAM, Program.class );
         final ScriptedTrackedEntityInstance scriptedTrackedEntityInstance = TransformerUtils.getScriptVariable( scriptVariables, ScriptVariable.TRACKED_ENTITY_INSTANCE, ScriptedTrackedEntityInstance.class );
         final Map<String, Object> variables = new HashMap<>( scriptVariables );
-        variables.put( ScriptVariable.ENROLLMENT.getVariableName(), new ImmutableScriptedEnrollment( new WritableScriptedEnrollment( program, enrollment, scriptedTrackedEntityInstance, valueConverter ) ) );
+        variables.put( ScriptVariable.ENROLLMENT.getVariableName(), new ImmutableScriptedEnrollment( new WritableScriptedEnrollment( program, enrollment, scriptedTrackedEntityInstance, scriptExecutionContext, valueConverter ) ) );
         return getOrgUnit( context, ruleInfo, resourceMapping.getImpEventOrgLookupScript(), variables );
     }
 
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ImmutableScriptedEnrollment.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ImmutableScriptedEnrollment.java
index 3d0799c8..eed9e055 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ImmutableScriptedEnrollment.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ImmutableScriptedEnrollment.java
@@ -28,10 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.dhis2.fhir.adapter.dhis.model.DhisResourceId;
-import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.dhis2.fhir.adapter.dhis.model.ImmutableDhisObject;
-import org.dhis2.fhir.adapter.fhir.transform.TransformerException;
 import org.dhis2.fhir.adapter.geo.Location;
 import org.dhis2.fhir.adapter.scriptable.Scriptable;
 
@@ -39,7 +37,6 @@
 import javax.annotation.Nullable;
 import java.io.Serializable;
 import java.time.ZonedDateTime;
-import java.util.Objects;
 
 /**
  * Immutable scripted enrollment.
@@ -47,105 +44,51 @@
  * @author volsch
  */
 @Scriptable
-public class ImmutableScriptedEnrollment implements ScriptedEnrollment, ImmutableDhisObject, Serializable
+public class ImmutableScriptedEnrollment extends ImmutableScriptedDhisResource implements ScriptedEnrollment, ImmutableDhisObject, Serializable
 {
     private static final long serialVersionUID = 3106142635120155470L;
 
-    private final ScriptedEnrollment delegate;
-
-    public ImmutableScriptedEnrollment( @Nonnull ScriptedEnrollment delegate )
-    {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public boolean isNewResource()
-    {
-        return delegate.isNewResource();
-    }
-
-    @Override
-    public boolean isLocal()
-    {
-        return delegate.isLocal();
-    }
-
-    @Override
-    public boolean isDeleted()
-    {
-        return delegate.isDeleted();
-    }
-
-    @Override
-    @Nullable
-    public String getId()
-    {
-        return delegate.getId();
-    }
-
-    @Nullable
-    @Override
-    public DhisResourceId getResourceId()
+    public ImmutableScriptedEnrollment( @Nonnull WritableScriptedEnrollment delegate )
     {
-        return delegate.getResourceId();
+        super( delegate );
     }
 
-    @Override
+    @JsonIgnore
     @Nonnull
-    public DhisResourceType getResourceType()
-    {
-        return delegate.getResourceType();
-    }
-
-    @Nullable
-    @Override
-    public ZonedDateTime getLastUpdated()
-    {
-        return delegate.getLastUpdated();
-    }
-
-    @Override
-    @Nullable
-    public String getOrganizationUnitId()
-    {
-        return delegate.getOrganizationUnitId();
-    }
-
-    @Nullable
-    @Override
-    public ScriptedTrackedEntityInstance getTrackedEntityInstance()
+    protected ScriptedEnrollment getInternalDelegate()
     {
-        if ( delegate.getTrackedEntityInstance() instanceof ImmutableDhisObject )
-        {
-            return delegate.getTrackedEntityInstance();
-        }
-        return new ImmutableScriptedTrackedEntityInstance( Objects.requireNonNull( delegate.getTrackedEntityInstance() ) );
+        return (ScriptedEnrollment) super.getDelegate();
     }
 
+    @JsonIgnore
     @Override
     @Nullable
     public ZonedDateTime getEnrollmentDate()
     {
-        return delegate.getEnrollmentDate();
+        return getInternalDelegate().getEnrollmentDate();
     }
 
+    @JsonIgnore
     @Override
     @Nullable
     public ZonedDateTime getIncidentDate()
     {
-        return delegate.getIncidentDate();
+        return getInternalDelegate().getIncidentDate();
     }
 
+    @JsonIgnore
     @Override
     @Nullable
     public Location getCoordinate()
     {
-        return delegate.getCoordinate();
+        return getInternalDelegate().getCoordinate();
     }
 
+    @JsonIgnore
+    @Nullable
     @Override
-    public void validate() throws TransformerException
+    public String getProgramId()
     {
-        delegate.validate();
+        return getInternalDelegate().getProgramId();
     }
 }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ScriptedEnrollment.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ScriptedEnrollment.java
index 8ff24d2a..8848d05b 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ScriptedEnrollment.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/ScriptedEnrollment.java
@@ -1,7 +1,7 @@
 package org.dhis2.fhir.adapter.fhir.transform.scripted;
 
 /*
- * Copyright (c) 2004-2018, University of Oslo
+ * Copyright (c) 2004-2019, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,8 +40,11 @@
  * @author volsch
  */
 @Scriptable
-public interface ScriptedEnrollment extends ScriptedDhisResource
+public interface ScriptedEnrollment extends AccessibleScriptedDhisResource
 {
+    @Nullable
+    String getProgramId();
+
     @Nullable
     ZonedDateTime getEnrollmentDate();
 
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/WritableScriptedEnrollment.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/WritableScriptedEnrollment.java
index d4680a9d..a9278a27 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/WritableScriptedEnrollment.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/scripted/WritableScriptedEnrollment.java
@@ -29,11 +29,10 @@
  */
 
 import org.dhis2.fhir.adapter.dhis.converter.ValueConverter;
-import org.dhis2.fhir.adapter.dhis.model.DhisResourceId;
-import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
 import org.dhis2.fhir.adapter.dhis.tracker.program.Enrollment;
 import org.dhis2.fhir.adapter.dhis.tracker.program.EnrollmentStatus;
 import org.dhis2.fhir.adapter.dhis.tracker.program.Program;
+import org.dhis2.fhir.adapter.fhir.script.ScriptExecutionContext;
 import org.dhis2.fhir.adapter.fhir.transform.TransformerException;
 import org.dhis2.fhir.adapter.fhir.transform.TransformerMappingException;
 import org.dhis2.fhir.adapter.fhir.transform.fhir.impl.util.ScriptedDateTimeUtils;
@@ -61,7 +60,7 @@
 @Scriptable
 @ScriptType( value = "Enrollment", var = "enrollment", transformDataType = "DHIS_ENROLLMENT",
     description = "Program instance (aka enrollment). If enrollment is not new and will be modified, it will be persisted." )
-public class WritableScriptedEnrollment implements ScriptedEnrollment, Serializable
+public class WritableScriptedEnrollment extends WritableScriptedDhisResource implements AccessibleScriptedDhisResource, ScriptedEnrollment, Serializable
 {
     private static final long serialVersionUID = -9043373621936561310L;
 
@@ -73,71 +72,16 @@ public class WritableScriptedEnrollment implements ScriptedEnrollment, Serializa
 
     private final ValueConverter valueConverter;
 
-    public WritableScriptedEnrollment( @Nonnull Program program, @Nonnull Enrollment enrollment, @Nonnull ScriptedTrackedEntityInstance trackedEntityInstance, @Nonnull ValueConverter valueConverter )
+    public WritableScriptedEnrollment( @Nonnull Program program, @Nonnull Enrollment enrollment, @Nonnull ScriptedTrackedEntityInstance trackedEntityInstance, @Nonnull ScriptExecutionContext scriptExecutionContext, @Nonnull ValueConverter valueConverter )
     {
+        super( enrollment, scriptExecutionContext );
+
         this.program = program;
         this.enrollment = enrollment;
         this.trackedEntityInstance = trackedEntityInstance;
         this.valueConverter = valueConverter;
     }
 
-    @Override
-    @ScriptMethod( description = "Returns if the event is new ans has not yet been saved on DHIS2." )
-    public boolean isNewResource()
-    {
-        return enrollment.isNewResource();
-    }
-
-    @Override
-    public boolean isLocal()
-    {
-        return enrollment.isLocal();
-    }
-
-    @Override
-    public boolean isDeleted()
-    {
-        return false;
-    }
-
-    @Nullable
-    @Override
-    @ScriptMethod( description = "Returns the ID of the event on DHIS2. Return null if the instance is new." )
-    public String getId()
-    {
-        return enrollment.getId();
-    }
-
-    @Nonnull
-    @Override
-    public DhisResourceType getResourceType()
-    {
-        return enrollment.getResourceType();
-    }
-
-    @Nullable
-    @Override
-    public DhisResourceId getResourceId()
-    {
-        return enrollment.getResourceId();
-    }
-
-    @Nullable
-    @Override
-    @ScriptMethod( description = "Returns the date and time when the resource has been updated the last time or null if this is a new resource." )
-    public ZonedDateTime getLastUpdated()
-    {
-        return enrollment.getLastUpdated();
-    }
-
-    @Nullable
-    @Override
-    @ScriptMethod( description = "Returns the ID of the organisation unit on DHIS2 where this event has been registered." )
-    public String getOrganizationUnitId()
-    {
-        return enrollment.getOrgUnitId();
-    }
-
     @Nullable
     @Override
     @ScriptMethod( description = "Returns the tracked entity instance to which this event belongs to." )
@@ -238,6 +182,13 @@ public boolean setStatus( @Nullable Object status )
         return true;
     }
 
+    @Nullable
+    @Override
+    public String getProgramId()
+    {
+        return program.getId();
+    }
+
     @Override
     @ScriptMethod( description = "Validates the content of the enrollment and throws an exception if the content is invalid." )
     public void validate() throws TransformerException
diff --git a/fhir/src/main/resources/db/migration/production/V1.1.0.45_0_0__Care_Resources_Read.sql b/fhir/src/main/resources/db/migration/production/V1.1.0.45_0_0__Care_Resources_Read.sql
new file mode 100644
index 00000000..e649d714
--- /dev/null
+++ b/fhir/src/main/resources/db/migration/production/V1.1.0.45_0_0__Care_Resources_Read.sql
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2004-2019, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO PROGRAM_STAGE_EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-- @formatter:off
+UPDATE fhir_rule SET exp_enabled=TRUE WHERE id='c4e17e7d-880e-45b5-9bc5-568da8c79742';
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtilsTest.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtilsTest.java
index b6c8758a..73a6d1a4 100644
--- a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtilsTest.java
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/BaseExtensionUtilsTest.java
@@ -28,9 +28,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import ca.uhn.fhir.model.primitive.DateDt;
+import org.hl7.fhir.instance.model.api.IBaseReference;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Date;
+
 /**
  * Unit tests for {@link BaseExtensionUtils}.
  *
@@ -39,7 +43,7 @@
 public class BaseExtensionUtilsTest
 {
     @Test
-    public void resetValue()
+    public void resetStringValue()
     {
         TestPlanDefinition planDefinition = new TestPlanDefinition();
 
@@ -50,7 +54,7 @@ public void resetValue()
     }
 
     @Test
-    public void setValue()
+    public void setStringValue()
     {
         TestPlanDefinition planDefinition = new TestPlanDefinition();
 
@@ -61,4 +65,53 @@ public void setValue()
         Assert.assertEquals( "testValue", planDefinition.getExtension().get( 0 ).getValue().toString() );
     }
 
+    @Test
+    public void resetDateValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        BaseExtensionUtils.setDateValue( "testUrl", planDefinition, new Date(), TypeFactory::createType );
+        BaseExtensionUtils.setDateValue( "testUrl", planDefinition, null, TypeFactory::createType );
+
+        Assert.assertTrue( planDefinition.getExtension().isEmpty() );
+    }
+
+    @Test
+    public void setDateValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        final Date date = new Date();
+
+        BaseExtensionUtils.setDateValue( "testUrl", planDefinition, new Date(), TypeFactory::createType );
+
+        Assert.assertEquals( 1, planDefinition.getExtension().size() );
+        Assert.assertEquals( "testUrl", planDefinition.getExtension().get( 0 ).getUrl() );
+        Assert.assertEquals( date, ( (DateDt) planDefinition.getExtension().get( 0 ).getValue() ).getValue() );
+    }
+
+    @Test
+    public void resetReferenceValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        BaseExtensionUtils.setReferenceValue( "testUrl", planDefinition, new TestReference() );
+        BaseExtensionUtils.setReferenceValue( "testUrl", planDefinition, null );
+
+        Assert.assertTrue( planDefinition.getExtension().isEmpty() );
+    }
+
+    @Test
+    public void setReferenceValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        final IBaseReference reference = new TestReference();
+
+        BaseExtensionUtils.setReferenceValue( "testUrl", planDefinition, reference );
+
+        Assert.assertEquals( 1, planDefinition.getExtension().size() );
+        Assert.assertEquals( "testUrl", planDefinition.getExtension().get( 0 ).getUrl() );
+        Assert.assertSame( reference, planDefinition.getExtension().get( 0 ).getValue() );
+    }
 }
\ No newline at end of file
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/IncidentDateExtensionUtilsTest.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/IncidentDateExtensionUtilsTest.java
new file mode 100644
index 00000000..2bacc7c8
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/IncidentDateExtensionUtilsTest.java
@@ -0,0 +1,68 @@
+package org.dhis2.fhir.adapter.fhir.extension;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import ca.uhn.fhir.model.primitive.DateDt;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Date;
+
+/**
+ * Unit tests for {@link IncidentDateExtensionUtils}.
+ *
+ * @author volsch
+ */
+public class IncidentDateExtensionUtilsTest
+{
+    @Test
+    public void resetValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        IncidentDateExtensionUtils.setValue( planDefinition, new Date(), TypeFactory::createType );
+        IncidentDateExtensionUtils.setValue( planDefinition, null, TypeFactory::createType );
+
+        Assert.assertTrue( planDefinition.getExtension().isEmpty() );
+    }
+
+    @Test
+    public void setValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        final Date date = new Date();
+
+        IncidentDateExtensionUtils.setValue( planDefinition, date, TypeFactory::createType );
+
+        Assert.assertEquals( 1, planDefinition.getExtension().size() );
+        Assert.assertEquals( IncidentDateExtensionUtils.URL, planDefinition.getExtension().get( 0 ).getUrl() );
+        Assert.assertSame( date, ( (DateDt) planDefinition.getExtension().get( 0 ).getValue() ).getValue() );
+    }
+}
\ No newline at end of file
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/LocationExtensionUtilsTest.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/LocationExtensionUtilsTest.java
new file mode 100644
index 00000000..9f09f0a2
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/LocationExtensionUtilsTest.java
@@ -0,0 +1,65 @@
+package org.dhis2.fhir.adapter.fhir.extension;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link LocationExtensionUtils}.
+ *
+ * @author volsch
+ */
+public class LocationExtensionUtilsTest
+{
+    @Test
+    public void resetValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        LocationExtensionUtils.setValue( planDefinition, new TestReference() );
+        LocationExtensionUtils.setValue( planDefinition, null );
+
+        Assert.assertTrue( planDefinition.getExtension().isEmpty() );
+    }
+
+    @Test
+    public void setValue()
+    {
+        TestPlanDefinition planDefinition = new TestPlanDefinition();
+
+        final TestReference reference = new TestReference();
+
+        LocationExtensionUtils.setValue( planDefinition, reference );
+
+        Assert.assertEquals( 1, planDefinition.getExtension().size() );
+        Assert.assertEquals( LocationExtensionUtils.URL, planDefinition.getExtension().get( 0 ).getUrl() );
+        Assert.assertEquals( reference, planDefinition.getExtension().get( 0 ).getValue() );
+    }
+}
\ No newline at end of file
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/TestReference.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/TestReference.java
new file mode 100644
index 00000000..09928d7b
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/TestReference.java
@@ -0,0 +1,107 @@
+package org.dhis2.fhir.adapter.fhir.extension;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.IBaseReference;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
+
+import java.util.List;
+
+/**
+ * Implementation of a reference for test purpose.
+ *
+ * @author volsch
+ */
+public class TestReference implements IBaseReference
+{
+    private static final long serialVersionUID = -5545480164325932302L;
+
+    @Override
+    public IBaseResource getResource()
+    {
+        return null;
+    }
+
+    @Override
+    public void setResource( IBaseResource theResource )
+    {
+
+    }
+
+    @Override
+    public IIdType getReferenceElement()
+    {
+        return null;
+    }
+
+    @Override
+    public IBaseReference setReference( String theReference )
+    {
+        return null;
+    }
+
+    @Override
+    public IBase setDisplay( String theValue )
+    {
+        return null;
+    }
+
+    @Override
+    public IPrimitiveType<String> getDisplayElement()
+    {
+        return null;
+    }
+
+    @Override
+    public boolean isEmpty()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean hasFormatComment()
+    {
+        return false;
+    }
+
+    @Override
+    public List<String> getFormatCommentsPre()
+    {
+        return null;
+    }
+
+    @Override
+    public List<String> getFormatCommentsPost()
+    {
+        return null;
+    }
+}
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/TypeFactory.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/TypeFactory.java
index 32329ee4..5ff164e1 100644
--- a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/TypeFactory.java
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/extension/TypeFactory.java
@@ -29,8 +29,8 @@
  */
 
 import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import org.junit.Assert;
 
 /**
  * Test type factory.
@@ -41,8 +41,15 @@ class TypeFactory
 {
     public static IElement createType( String name )
     {
-        Assert.assertEquals( "string", name );
+        if ( "string".equals( name ) )
+        {
+            return new StringDt();
+        }
+        else if ( "date".equals( name ) )
+        {
+            return new DateDt();
+        }
 
-        return new StringDt();
+        throw new IllegalArgumentException( name );
     }
 }
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/ProgramTrackedEntityTypeUtilsTest.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/ProgramTrackedEntityTypeUtilsTest.java
new file mode 100644
index 00000000..741cd8fe
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/program/ProgramTrackedEntityTypeUtilsTest.java
@@ -0,0 +1,122 @@
+package org.dhis2.fhir.adapter.fhir.transform.dhis.impl.metadata.program;
+
+/*
+ * Copyright (c) 2004-2019, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.dhis2.fhir.adapter.dhis.model.Reference;
+import org.dhis2.fhir.adapter.dhis.model.ReferenceType;
+import org.dhis2.fhir.adapter.dhis.tracker.program.WritableProgram;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.TrackedEntityMetadataService;
+import org.dhis2.fhir.adapter.dhis.tracker.trackedentity.WritableTrackedEntityType;
+import org.dhis2.fhir.adapter.fhir.metadata.model.FhirResourceType;
+import org.dhis2.fhir.adapter.fhir.metadata.model.TrackedEntityRule;
+import org.dhis2.fhir.adapter.fhir.metadata.repository.TrackedEntityRuleRepository;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+
+/**
+ * Unit tests of {@link ProgramTrackedEntityTypeUtils}.
+ *
+ * @author volsch
+ */
+public class ProgramTrackedEntityTypeUtilsTest
+{
+    @Mock
+    private TrackedEntityMetadataService trackedEntityMetadataService;
+
+    @Mock
+    private TrackedEntityRuleRepository trackedEntityRuleRepository;
+
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule().silent();
+
+    @Test
+    public void addSubjectResourceType()
+    {
+        final TrackedEntityRule rule1 = new TrackedEntityRule();
+        rule1.setEvaluationOrder( 1 );
+        rule1.setFhirResourceType( FhirResourceType.RELATED_PERSON );
+
+        final TrackedEntityRule rule2 = new TrackedEntityRule();
+        rule2.setEvaluationOrder( 100 );
+        rule2.setFhirResourceType( FhirResourceType.PATIENT );
+
+        Mockito.doReturn( Optional.of( new WritableTrackedEntityType( "a1234567890", "Test", Collections.emptyList() ) ) )
+            .when( trackedEntityMetadataService ).findTypeByReference( Mockito.eq( new Reference( "a1234567890", ReferenceType.ID ) ) );
+        Mockito.doReturn( Arrays.asList( rule1, rule2 ) ).when( trackedEntityRuleRepository ).findByTypeRefs( Mockito.eq( new HashSet<>(
+            Arrays.asList( new Reference( "a1234567890", ReferenceType.ID ), new Reference( "Test", ReferenceType.NAME ) ) ) ) );
+
+        final WritableProgram program = new WritableProgram();
+        program.setName( "Test Program" );
+        program.setDescription( "Test Description" );
+        program.setWithoutRegistration( false );
+        program.setTrackedEntityTypeId( "a1234567890" );
+        program.setStages( new ArrayList<>() );
+
+        Assert.assertEquals( FhirResourceType.PATIENT, ProgramTrackedEntityTypeUtils.getTrackedEntityFhirResourceType( trackedEntityMetadataService, trackedEntityRuleRepository, program ) );
+    }
+
+    @Test
+    public void addSubjectResourceTypeWithoutTrackedEntityType()
+    {
+        final WritableProgram program = new WritableProgram();
+        program.setName( "Test Program" );
+        program.setDescription( "Test Description" );
+        program.setWithoutRegistration( false );
+        program.setStages( new ArrayList<>() );
+
+        Assert.assertNull( ProgramTrackedEntityTypeUtils.getTrackedEntityFhirResourceType( trackedEntityMetadataService, trackedEntityRuleRepository, program ) );
+    }
+
+    @Test
+    public void addSubjectResourceTypeWithoutTrackedEntityMetadata()
+    {
+        Mockito.doReturn( Optional.empty() )
+            .when( trackedEntityMetadataService ).findTypeByReference( Mockito.eq( new Reference( "a1234567890", ReferenceType.ID ) ) );
+
+        final WritableProgram program = new WritableProgram();
+        program.setName( "Test Program" );
+        program.setDescription( "Test Description" );
+        program.setWithoutRegistration( false );
+        program.setTrackedEntityTypeId( "a1234567890" );
+        program.setStages( new ArrayList<>() );
+
+        Assert.assertNull( ProgramTrackedEntityTypeUtils.getTrackedEntityFhirResourceType( trackedEntityMetadataService, trackedEntityRuleRepository, program ) );
+    }
+}
\ No newline at end of file