diff --git a/README.md b/README.md
index 058caa60..41d6779f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 # DHIS2 FHIR Adapter
 ## Overview
 This repository contains the source code of the DHIS2 FHIR Adapter. The current scope of the Adapter is to import data into DHIS2 Tracker by using FHIR Subscriptions. Event if the adapter may support more FHIR Resource types at the moment, the initial 
- official support is for FHIR Patient resources that are transformed to DHIS2 Tracked Entity instances. 
+ official support is for FHIR Patient resources that are transformed to DHIS2 Tracked Entity instances.
+ 
+The import works on the basis of a domain specific business rule engine that decides about transformations of medical data to questionnaire-like structures (DHIS2 Tracker Programs and their Program Stages). 
 
 ![DHIS2 FHIR Adapter High Level Architecture](docs/images/DHIS2_FHIR_Adapter_High_Level_Architecture.png "DHIS2 FHIR Adapter High Level Architecture")
 
diff --git a/app/src/main/java/org/dhis2/fhir/adapter/AppConfig.java b/app/src/main/java/org/dhis2/fhir/adapter/AppConfig.java
index 3d09025e..df9680e0 100644
--- a/app/src/main/java/org/dhis2/fhir/adapter/AppConfig.java
+++ b/app/src/main/java/org/dhis2/fhir/adapter/AppConfig.java
@@ -28,62 +28,31 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
-import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import org.dhis2.fhir.adapter.jackson.SecuredPropertyFilter;
-import org.dhis2.fhir.adapter.jackson.ToManyPropertyFilter;
-import org.dhis2.fhir.adapter.jackson.ToOnePropertyFilter;
-import org.dhis2.fhir.adapter.jackson.ZonedDateTimeDeserializer;
-import org.dhis2.fhir.adapter.jackson.ZonedDateTimeSerializer;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.dhis2.fhir.adapter.converter.ZonedDateTimeToDateConverter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
+import org.springframework.format.FormatterRegistry;
 import org.springframework.http.HttpMethod;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import javax.annotation.Nonnull;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
+import java.time.ZonedDateTime;
+import java.util.Date;
 
 /**
+ * Common application configuration.
+ *
  * @author volsch
  */
 @Configuration
 @Validated
 public class AppConfig
 {
-    @Bean
-    @Order( 1 )
-    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer()
-    {
-        return jacksonObjectMapperBuilder -> {
-            final ZoneId zoneId = ZoneId.systemDefault();
-            jacksonObjectMapperBuilder
-                .serializers(
-                    new ZonedDateTimeSerializer(),
-                    new LocalDateSerializer( DateTimeFormatter.ISO_LOCAL_DATE ) )
-                .deserializers(
-                    new ZonedDateTimeDeserializer(),
-                    new LocalDateDeserializer( DateTimeFormatter.ISO_LOCAL_DATE ) );
-            jacksonObjectMapperBuilder.filters( new SimpleFilterProvider()
-                .addFilter( SecuredPropertyFilter.FILTER_NAME, new SecuredPropertyFilter() )
-                .addFilter( ToManyPropertyFilter.FILTER_NAME, new SimpleBeanPropertyFilter()
-                {
-                } )
-                .addFilter( ToOnePropertyFilter.FILTER_NAME, new SimpleBeanPropertyFilter()
-                {
-                } ) );
-        };
-    }
-
     @Bean
     @Nonnull
-    public WebMvcConfigurer corsConfigurer()
+    public WebMvcConfigurer mvcConfigurer()
     {
         return new WebMvcConfigurer()
         {
@@ -95,6 +64,12 @@ public void addCorsMappings( @Nonnull CorsRegistry registry )
                     .allowedMethods( HttpMethod.GET.name(), HttpMethod.POST.name(), HttpMethod.PUT.name(), HttpMethod.PATCH.name(), HttpMethod.DELETE.name(), HttpMethod.HEAD.name(), HttpMethod.OPTIONS.name() )
                     .allowCredentials( true );
             }
+
+            @Override
+            public void addFormatters( @Nonnull FormatterRegistry registry )
+            {
+                registry.addConverter( ZonedDateTime.class, Date.class, new ZonedDateTimeToDateConverter() );
+            }
         };
     }
 }
diff --git a/app/src/main/resources/application.yml b/app/src/main/resources/application.yml
index 1ee843c6..85961ac1 100644
--- a/app/src/main/resources/application.yml
+++ b/app/src/main/resources/application.yml
@@ -27,9 +27,6 @@
 #
 
 spring:
-  jackson:
-    serialization:
-      write-dates-as-timestamps: false
   data:
     rest:
       basePath: /api
@@ -39,6 +36,10 @@ spring:
     hibernate:
       ddl-auto: none
     open-in-view: false
+    properties:
+      hibernate:
+        jdbc:
+          time_zone: UTC
   application:
     name: DHIS2 FHIR Adapter
 
diff --git a/app/src/main/resources/templates/setup.html b/app/src/main/resources/templates/setup.html
index f47c9f79..ee6ee763 100644
--- a/app/src/main/resources/templates/setup.html
+++ b/app/src/main/resources/templates/setup.html
@@ -32,6 +32,10 @@
   <title>DHIS2 FHIR Adapter - Initial Setup</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <style>
+    br {
+      line-height : 150%;
+    }
+
     label {
       display : inline-block;
       width   : 150px;
diff --git a/common/src/main/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverter.java b/common/src/main/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverter.java
new file mode 100644
index 00000000..e419681e
--- /dev/null
+++ b/common/src/main/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverter.java
@@ -0,0 +1,57 @@
+package org.dhis2.fhir.adapter.converter;
+
+/*
+ * Copyright (c) 2004-2018, 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 javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Date;
+
+/**
+ * Converts a zoned date time to a date with system time zone.
+ *
+ * @author volsch
+ */
+public class ZonedDateTimeToDateConverter extends TypedConverter<ZonedDateTime, Date>
+{
+    private final ZoneId zoneId = ZoneId.systemDefault();
+
+    public ZonedDateTimeToDateConverter()
+    {
+        super( ZonedDateTime.class, Date.class );
+    }
+
+    @Override
+    @Nullable
+    public Date doConvert( @Nonnull ZonedDateTime source )
+    {
+        return Date.from( source.toInstant() );
+    }
+}
diff --git a/common/src/main/java/org/dhis2/fhir/adapter/jackson/JacksonConfig.java b/common/src/main/java/org/dhis2/fhir/adapter/jackson/JacksonConfig.java
new file mode 100644
index 00000000..def45d8b
--- /dev/null
+++ b/common/src/main/java/org/dhis2/fhir/adapter/jackson/JacksonConfig.java
@@ -0,0 +1,78 @@
+package org.dhis2.fhir.adapter.jackson;
+
+/*
+ * Copyright (c) 2004-2018, 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 com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Configures Jackson for the application.
+ *
+ * @author volsch
+ */
+@Configuration
+@Validated
+public class JacksonConfig
+{
+    @Bean
+    @Order( 1 )
+    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer()
+    {
+        return jacksonObjectMapperBuilder -> {
+            final ZoneId zoneId = ZoneId.systemDefault();
+            jacksonObjectMapperBuilder
+                .serializers(
+                    new ZonedDateTimeSerializer(),
+                    new LocalDateSerializer( DateTimeFormatter.ISO_LOCAL_DATE ) )
+                .deserializers(
+                    new ZonedDateTimeDeserializer(),
+                    new LocalDateDeserializer( DateTimeFormatter.ISO_LOCAL_DATE ) );
+            jacksonObjectMapperBuilder.filters( new SimpleFilterProvider()
+                .addFilter( SecuredPropertyFilter.FILTER_NAME, new SecuredPropertyFilter() )
+                .addFilter( ToManyPropertyFilter.FILTER_NAME, new SimpleBeanPropertyFilter()
+                {
+                } )
+                .addFilter( ToOnePropertyFilter.FILTER_NAME, new SimpleBeanPropertyFilter()
+                {
+                } ) );
+            jacksonObjectMapperBuilder.featuresToDisable( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS );
+        };
+    }
+}
diff --git a/common/src/test/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverterTest.java b/common/src/test/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverterTest.java
new file mode 100644
index 00000000..b347afe3
--- /dev/null
+++ b/common/src/test/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverterTest.java
@@ -0,0 +1,60 @@
+package org.dhis2.fhir.adapter.converter;
+
+/*
+ * Copyright (c) 2004-2018, 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;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+/**
+ * Unit tests for {@link ZonedDateTimeToDateConverter}.
+ *
+ * @author volsch
+ */
+public class ZonedDateTimeToDateConverterTest
+{
+    private ZonedDateTimeToDateConverter converter = new ZonedDateTimeToDateConverter();
+
+    @Test
+    public void docConvert()
+    {
+        final Date date = new GregorianCalendar( 2018, 7, 15, 17, 24, 23 ).getTime();
+        Assert.assertEquals( date, converter.convert( ZonedDateTime.of( 2018, 8, 15, 17, 24, 23, 0, ZoneId.systemDefault() ) ) );
+    }
+
+    @Test
+    public void doConvertNull()
+    {
+        Assert.assertNull( converter.convert( null ) );
+    }
+}
\ No newline at end of file
diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/config/DhisConfig.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/config/DhisConfig.java
index dd699e82..28c7a06f 100644
--- a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/config/DhisConfig.java
+++ b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/config/DhisConfig.java
@@ -33,8 +33,10 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.dhis2.fhir.adapter.auth.AuthorizationContext;
@@ -51,6 +53,7 @@
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Nonnull;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
@@ -121,9 +124,11 @@ public GenericJackson2JsonRedisSerializer cacheRedisSerializer()
         mapper.disable( WRITE_DATES_AS_TIMESTAMPS );
 
         final SimpleModule module = new SimpleModule();
+        module.addSerializer( InstantSerializer.INSTANCE );
         module.addSerializer( LocalDateTimeSerializer.INSTANCE );
         module.addSerializer( new ZonedDateTimeSerializer() );
         module.addSerializer( new LocalDateSerializer( DateTimeFormatter.ISO_LOCAL_DATE ) );
+        module.addDeserializer( Instant.class, InstantDeserializer.INSTANT );
         module.addDeserializer( LocalDateTime.class, LocalDateTimeDeserializer.INSTANCE );
         module.addDeserializer( ZonedDateTime.class, new ZonedDateTimeDeserializer() );
         module.addDeserializer( LocalDate.class, new LocalDateDeserializer( DateTimeFormatter.ISO_LOCAL_DATE ) );
diff --git a/fhir/pom.xml b/fhir/pom.xml
index 7ad5e630..acfccd37 100644
--- a/fhir/pom.xml
+++ b/fhir/pom.xml
@@ -80,6 +80,21 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-rest</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.restdocs</groupId>
+      <artifactId>spring-restdocs-mockmvc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/DataBasePackage.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/DataBasePackage.java
new file mode 100644
index 00000000..1ba688e9
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/DataBasePackage.java
@@ -0,0 +1,38 @@
+package org.dhis2.fhir.adapter.fhir.data;
+
+/*
+ * Copyright (c) 2004-2018, 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.
+ */
+
+/**
+ * Marker interface that is used to reference package as base package.
+ *
+ * @author volsch
+ */
+public interface DataBasePackage
+{
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/ProcessedRemoteFhirResource.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/ProcessedRemoteFhirResource.java
index 79d7b81b..657920b9 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/ProcessedRemoteFhirResource.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/ProcessedRemoteFhirResource.java
@@ -36,7 +36,7 @@
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 /**
  * A processed remote FHIR resource that contains also the distinct version of the
@@ -52,14 +52,14 @@ public class ProcessedRemoteFhirResource implements Serializable
 
     private ProcessedRemoteFhirResourceId id;
 
-    private LocalDateTime processedAt;
+    private Instant processedAt;
 
     public ProcessedRemoteFhirResource()
     {
         super();
     }
 
-    public ProcessedRemoteFhirResource( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull String versionedFhirResourceId, @Nonnull LocalDateTime processedAt )
+    public ProcessedRemoteFhirResource( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull String versionedFhirResourceId, @Nonnull Instant processedAt )
     {
         this.id = new ProcessedRemoteFhirResourceId( remoteSubscriptionResource, versionedFhirResourceId );
         this.processedAt = processedAt;
@@ -77,12 +77,12 @@ public void setId( ProcessedRemoteFhirResourceId id )
     }
 
     @Column( name = "processed_at", nullable = false )
-    public LocalDateTime getProcessedAt()
+    public Instant getProcessedAt()
     {
         return processedAt;
     }
 
-    public void setProcessedAt( LocalDateTime processedAt )
+    public void setProcessedAt( Instant processedAt )
     {
         this.processedAt = processedAt;
     }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteFhirResource.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteFhirResource.java
index fa6caf54..db0a14cd 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteFhirResource.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteFhirResource.java
@@ -36,7 +36,7 @@
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 /**
  * Entity that contains if currently for {@linkplain RemoteSubscriptionResource remote subscription resource}
@@ -54,7 +54,7 @@ public class QueuedRemoteFhirResource implements Serializable
 
     private String requestId;
 
-    private LocalDateTime queuedAt;
+    private Instant queuedAt;
 
     @EmbeddedId
     public QueuedRemoteFhirResourceId getId()
@@ -80,12 +80,12 @@ public void setRequestId( String requestId )
     }
 
     @Column( name = "queued_at", nullable = false )
-    public LocalDateTime getQueuedAt()
+    public Instant getQueuedAt()
     {
         return queuedAt;
     }
 
-    public void setQueuedAt( LocalDateTime queuedAt )
+    public void setQueuedAt( Instant queuedAt )
     {
         this.queuedAt = queuedAt;
     }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteSubscriptionRequest.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteSubscriptionRequest.java
index 32d4dca8..2d1d74df 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteSubscriptionRequest.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/model/QueuedRemoteSubscriptionRequest.java
@@ -39,7 +39,7 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 /**
@@ -60,7 +60,7 @@ public class QueuedRemoteSubscriptionRequest implements Serializable
 
     private String requestId;
 
-    private LocalDateTime queuedAt;
+    private Instant queuedAt;
 
     @Id
     @Column( name = "id", nullable = false )
@@ -100,12 +100,12 @@ public void setRequestId( String requestId )
     }
 
     @Column( name = "queued_at", nullable = false )
-    public LocalDateTime getQueuedAt()
+    public Instant getQueuedAt()
     {
         return queuedAt;
     }
 
-    public void setQueuedAt( LocalDateTime queuedAt )
+    public void setQueuedAt( Instant queuedAt )
     {
         this.queuedAt = queuedAt;
     }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/CustomProcessedRemoteFhirResourceRepository.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/CustomProcessedRemoteFhirResourceRepository.java
index 4bc12fc6..03f9695e 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/CustomProcessedRemoteFhirResourceRepository.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/CustomProcessedRemoteFhirResourceRepository.java
@@ -32,7 +32,7 @@
 import org.dhis2.fhir.adapter.fhir.metadata.model.RemoteSubscriptionResource;
 
 import javax.annotation.Nonnull;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.function.Consumer;
 
 /**
@@ -42,5 +42,5 @@ public interface CustomProcessedRemoteFhirResourceRepository
 {
     void process( @Nonnull ProcessedRemoteFhirResource processedRemoteFhirResource, @Nonnull Consumer<ProcessedRemoteFhirResource> consumer );
 
-    int deleteOldest( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull LocalDateTime timestamp );
+    int deleteOldest( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull Instant timestamp );
 }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomProcessedRemoteFhirResourceRepositoryImpl.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomProcessedRemoteFhirResourceRepositoryImpl.java
index 2e65ab9b..84315c47 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomProcessedRemoteFhirResourceRepositoryImpl.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomProcessedRemoteFhirResourceRepositoryImpl.java
@@ -36,7 +36,7 @@
 import javax.annotation.Nonnull;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.function.Consumer;
 
 /**
@@ -60,7 +60,7 @@ public void process( @Nonnull ProcessedRemoteFhirResource processedRemoteFhirRes
 
     @Transactional
     @Override
-    public int deleteOldest( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull LocalDateTime timestamp )
+    public int deleteOldest( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull Instant timestamp )
     {
         return entityManager.createQuery( "DELETE FROM ProcessedRemoteFhirResource p WHERE p.id.remoteSubscriptionResource=:remoteSubscriptionResource AND p.processedAt<:timestamp" )
             .setParameter( "remoteSubscriptionResource", remoteSubscriptionResource ).setParameter( "timestamp", timestamp ).executeUpdate();
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteFhirResourceRepositoryImpl.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteFhirResourceRepositoryImpl.java
index 2c4e8ffe..51ba8167 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteFhirResourceRepositoryImpl.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteFhirResourceRepositoryImpl.java
@@ -37,7 +37,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 /**
@@ -58,7 +58,7 @@ public boolean enqueue( @Nonnull UUID subscriptionResourceId, @Nonnull String fh
         final Query query = entityManager.createNativeQuery( "INSERT INTO fhir_queued_remote_resource(remote_subscription_resource_id,fhir_resource_id,request_id,queued_at) " +
             "VALUES (:subscriptionResourceId,:fhirResourceId,:requestId,:queuedAt) ON CONFLICT ON CONSTRAINT fhir_queued_remote_resource_pk DO NOTHING RETURNING request_id" )
             .setParameter( "subscriptionResourceId", subscriptionResourceId ).setParameter( "fhirResourceId", fhirResourceId )
-            .setParameter( "requestId", requestId ).setParameter( "queuedAt", LocalDateTime.now() );
+            .setParameter( "requestId", requestId ).setParameter( "queuedAt", Instant.now() );
         // avoid invalidation of complete 2nd level cache
         query.unwrap( NativeQuery.class ).addSynchronizedEntityClass( QueuedRemoteSubscriptionRequest.class );
         return query.getResultList().stream().anyMatch( requestId::equals );
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteSubscriptionRequestRepositoryImpl.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteSubscriptionRequestRepositoryImpl.java
index dd19be7d..4395861c 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteSubscriptionRequestRepositoryImpl.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/data/repository/impl/CustomQueuedRemoteSubscriptionRequestRepositoryImpl.java
@@ -37,7 +37,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 /**
@@ -57,7 +57,7 @@ public boolean enqueue( @Nonnull UUID subscriptionResourceId, @Nonnull String re
     {
         final Query query = entityManager.createNativeQuery( "INSERT INTO fhir_queued_remote_subscription_request(id,request_id,queued_at) " +
             "VALUES (:id,:requestId,:queuedAt) ON CONFLICT ON CONSTRAINT fhir_queued_remote_subscription_request_pk DO NOTHING RETURNING request_id" )
-            .setParameter( "id", subscriptionResourceId ).setParameter( "requestId", requestId ).setParameter( "queuedAt", LocalDateTime.now() );
+            .setParameter( "id", subscriptionResourceId ).setParameter( "requestId", requestId ).setParameter( "queuedAt", Instant.now() );
         // avoid invalidation of complete 2nd level cache
         query.unwrap( NativeQuery.class ).addSynchronizedEntityClass( QueuedRemoteSubscriptionRequest.class );
         return query.getResultList().stream().anyMatch( requestId::equals );
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/MetadataBasePackage.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/MetadataBasePackage.java
new file mode 100644
index 00000000..3bf6589f
--- /dev/null
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/MetadataBasePackage.java
@@ -0,0 +1,38 @@
+package org.dhis2.fhir.adapter.fhir.metadata;
+
+/*
+ * Copyright (c) 2004-2018, 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.
+ */
+
+/**
+ * Marker interface that is used to reference package as base package.
+ *
+ * @author volsch
+ */
+public interface MetadataBasePackage
+{
+}
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/AbstractRule.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/AbstractRule.java
index 6bcecb13..a45a2787 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/AbstractRule.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/AbstractRule.java
@@ -115,7 +115,7 @@ public void setName( String name )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Code.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Code.java
index e8e0ee45..cf84df6e 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Code.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Code.java
@@ -108,7 +108,7 @@ public void setMappedCode( String mappedCode )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeCategory.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeCategory.java
index d2d69629..d8208190 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeCategory.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeCategory.java
@@ -78,7 +78,7 @@ public void setCode( String code )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeSet.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeSet.java
index 7351c388..55101eb8 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeSet.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/CodeSet.java
@@ -79,7 +79,7 @@ public void setCode( String code )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Constant.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Constant.java
index 5feb48e6..f5e95c15 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Constant.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Constant.java
@@ -74,7 +74,7 @@ public void setName( String name )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgram.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgram.java
index f2f30f67..a6712f36 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgram.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgram.java
@@ -76,7 +76,7 @@ public void setName( String name )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgramStage.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgramStage.java
index f4e22e88..b8c9b081 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgramStage.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/MappedTrackerProgramStage.java
@@ -79,7 +79,7 @@ public void setName( String name )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscription.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscription.java
index 36cf3935..f3cb755d 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscription.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscription.java
@@ -127,7 +127,7 @@ public void setLocked( boolean locked )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResource.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResource.java
index 25957faa..c0dc6dfd 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResource.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResource.java
@@ -87,7 +87,7 @@ public void setFhirCriteriaParameters( String fhirCriteriaParameters )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResourceUpdate.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResourceUpdate.java
index ab422471..91548852 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResourceUpdate.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/RemoteSubscriptionResourceUpdate.java
@@ -39,7 +39,7 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 /**
@@ -55,7 +55,7 @@ public class RemoteSubscriptionResourceUpdate implements Serializable
 
     private UUID id;
     private RemoteSubscriptionResource remoteSubscriptionResource;
-    private LocalDateTime remoteLastUpdated;
+    private Instant remoteLastUpdated;
 
     @Id
     public UUID getId()
@@ -84,12 +84,12 @@ public void setRemoteSubscriptionResource( RemoteSubscriptionResource remoteSubs
 
     @Basic
     @Column( name = "remote_last_updated", nullable = false )
-    public LocalDateTime getRemoteLastUpdated()
+    public Instant getRemoteLastUpdated()
     {
         return remoteLastUpdated;
     }
 
-    public void setRemoteLastUpdated( LocalDateTime remoteLastUpdate )
+    public void setRemoteLastUpdated( Instant remoteLastUpdate )
     {
         this.remoteLastUpdated = remoteLastUpdate;
     }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Script.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Script.java
index acd73fe0..bfa30b33 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Script.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/Script.java
@@ -91,7 +91,7 @@ public void setName( String name )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptArg.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptArg.java
index 51f2b673..9bdde6f9 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptArg.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptArg.java
@@ -132,7 +132,7 @@ public void setDefaultValue( String defaultValue )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptSource.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptSource.java
index 446f784b..1a9efca1 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptSource.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/ScriptSource.java
@@ -64,7 +64,7 @@ public class ScriptSource extends VersionedBaseMetadata implements Serializable
     private SortedSet<FhirVersion> fhirVersions;
 
     @Basic
-    @Column( name = "source_text", nullable = false, length = -1 )
+    @Column( name = "source_text", nullable = false, columnDefinition = "TEXT" )
     public String getSourceText()
     {
         return sourceText;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/System.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/System.java
index df072bf0..5eb35152 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/System.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/System.java
@@ -102,7 +102,7 @@ public void setEnabled( boolean enabled )
     }
 
     @Basic
-    @Column( name = "description", length = -1 )
+    @Column( name = "description", columnDefinition = "TEXT" )
     public String getDescription()
     {
         return description;
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/VersionedBaseMetadata.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/VersionedBaseMetadata.java
index 05a07682..d82c5c0e 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/VersionedBaseMetadata.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/VersionedBaseMetadata.java
@@ -42,7 +42,7 @@
 import javax.persistence.PreUpdate;
 import javax.persistence.Version;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 /**
@@ -57,9 +57,9 @@ public class VersionedBaseMetadata implements Serializable, FhirAdapterMetadata<
 
     private UUID id;
     private Long version;
-    private LocalDateTime createdAt;
+    private Instant createdAt;
     private String lastUpdatedBy;
-    private LocalDateTime lastUpdatedAt;
+    private Instant lastUpdatedAt;
 
     @Override
     @GeneratedValue( generator = "uuid2" )
@@ -90,12 +90,12 @@ public void setVersion( Long version )
 
     @Basic
     @Column( name = "created_at", nullable = false, updatable = false )
-    public LocalDateTime getCreatedAt()
+    public Instant getCreatedAt()
     {
         return createdAt;
     }
 
-    public void setCreatedAt( LocalDateTime createdAt )
+    public void setCreatedAt( Instant createdAt )
     {
         this.createdAt = createdAt;
     }
@@ -115,12 +115,12 @@ public void setLastUpdatedBy( String lastUpdatedBy )
     @Basic
     @Column( name = "last_updated_at", nullable = false )
     @LastModifiedDate
-    public LocalDateTime getLastUpdatedAt()
+    public Instant getLastUpdatedAt()
     {
         return lastUpdatedAt;
     }
 
-    public void setLastUpdatedAt( LocalDateTime lastUpdatedAt )
+    public void setLastUpdatedAt( Instant lastUpdatedAt )
     {
         this.lastUpdatedAt = lastUpdatedAt;
     }
@@ -128,7 +128,7 @@ public void setLastUpdatedAt( LocalDateTime lastUpdatedAt )
     @PrePersist
     protected void onPrePersist()
     {
-        setCreatedAt( LocalDateTime.now() );
+        setCreatedAt( Instant.now() );
         setLastUpdatedAt( getCreatedAt() );
         setLastUpdatedBy( AdapterSecurityUtils.getCurrentUsername() );
     }
@@ -136,7 +136,7 @@ protected void onPrePersist()
     @PreUpdate
     protected void onPreUpdate()
     {
-        setLastUpdatedAt( LocalDateTime.now() );
+        setLastUpdatedAt( Instant.now() );
         setLastUpdatedBy( AdapterSecurityUtils.getCurrentUsername() );
     }
 }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CodeCategoryRepository.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CodeCategoryRepository.java
index 5e34a795..23fc0792 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CodeCategoryRepository.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CodeCategoryRepository.java
@@ -46,7 +46,7 @@
  * @author volsch
  */
 @CacheConfig( cacheManager = "metadataCacheManager", cacheNames = "codeCategory" )
-@RepositoryRestResource
+@RepositoryRestResource( path = "codeCategories" )
 @PreAuthorize( "hasRole('CODE_MAPPING')" )
 public interface CodeCategoryRepository extends JpaRepository<CodeCategory, UUID>
 {
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CustomRemoteSubscriptionResourceUpdateRepository.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CustomRemoteSubscriptionResourceUpdateRepository.java
index b3940071..258f8d4a 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CustomRemoteSubscriptionResourceUpdateRepository.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CustomRemoteSubscriptionResourceUpdateRepository.java
@@ -33,7 +33,7 @@
 import org.springframework.data.rest.core.annotation.RestResource;
 
 import javax.annotation.Nonnull;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 /**
  * Custom repository for {@link RemoteSubscriptionResourceUpdate}.
@@ -44,8 +44,8 @@ public interface CustomRemoteSubscriptionResourceUpdateRepository
 {
     @RestResource( exported = false )
     @Nonnull
-    LocalDateTime getRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource );
+    Instant getRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource );
 
     @RestResource( exported = false )
-    boolean updateRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull LocalDateTime lastUpdated );
+    boolean updateRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull Instant lastUpdated );
 }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionRepositoryImpl.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionRepositoryImpl.java
index 5de6f154..a13a5218 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionRepositoryImpl.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionRepositoryImpl.java
@@ -42,7 +42,7 @@
 import javax.annotation.Nonnull;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -134,7 +134,7 @@ protected List<RemoteSubscriptionResource> createAutoCreatedSubscriptionResource
 
                         final RemoteSubscriptionResourceUpdate resourceUpdate = new RemoteSubscriptionResourceUpdate();
                         resourceUpdate.setRemoteSubscriptionResource( rsr );
-                        resourceUpdate.setRemoteLastUpdated( LocalDateTime.now() );
+                        resourceUpdate.setRemoteLastUpdated( Instant.now() );
                         rsr.setResourceUpdate( resourceUpdate );
 
                         autoCreatedRemoteSubscriptionResources.add( rsr );
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionResourceUpdateRepositoryImpl.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionResourceUpdateRepositoryImpl.java
index 9ee94b1a..f9cb2f7c 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionResourceUpdateRepositoryImpl.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRemoteSubscriptionResourceUpdateRepositoryImpl.java
@@ -38,7 +38,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
 import javax.persistence.PersistenceContext;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 /**
  * Implementation of {@link CustomRemoteSubscriptionResourceUpdateRepository}.
@@ -56,7 +56,7 @@ public CustomRemoteSubscriptionResourceUpdateRepositoryImpl( @Nonnull EntityMana
     @RestResource( exported = false )
     @Nonnull
     @Override
-    public LocalDateTime getRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource )
+    public Instant getRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource )
     {
         RemoteSubscriptionResourceUpdate rsr = entityManager.find( RemoteSubscriptionResourceUpdate.class, remoteSubscriptionResource.getId() );
         if ( rsr == null )
@@ -64,7 +64,7 @@ public LocalDateTime getRemoteLastUpdated( @Nonnull RemoteSubscriptionResource r
             rsr = new RemoteSubscriptionResourceUpdate();
             rsr.setId( remoteSubscriptionResource.getId() );
             rsr.setRemoteSubscriptionResource( remoteSubscriptionResource );
-            rsr.setRemoteLastUpdated( LocalDateTime.now() );
+            rsr.setRemoteLastUpdated( Instant.now() );
             entityManager.persist( rsr );
         }
         return rsr.getRemoteLastUpdated();
@@ -73,7 +73,7 @@ public LocalDateTime getRemoteLastUpdated( @Nonnull RemoteSubscriptionResource r
     @RestResource( exported = false )
     @Transactional
     @Override
-    public boolean updateRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull LocalDateTime lastUpdated )
+    public boolean updateRemoteLastUpdated( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource, @Nonnull Instant lastUpdated )
     {
         final RemoteSubscriptionResourceUpdate rsr = entityManager.find( RemoteSubscriptionResourceUpdate.class, remoteSubscriptionResource.getId() );
         if ( rsr == null )
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/listener/RemoteSubscriptionResourceEventListener.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/listener/RemoteSubscriptionResourceEventListener.java
index 3f3c08f3..159f2fea 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/listener/RemoteSubscriptionResourceEventListener.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/listener/RemoteSubscriptionResourceEventListener.java
@@ -37,7 +37,7 @@
 import javax.annotation.Nonnull;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 /**
  * Event listener that prepares {@link RemoteSubscriptionResource} class before saving.
@@ -63,7 +63,7 @@ protected void onBeforeCreate( RemoteSubscriptionResource entity )
     {
         final RemoteSubscriptionResourceUpdate resourceUpdate = new RemoteSubscriptionResourceUpdate();
         resourceUpdate.setRemoteSubscriptionResource( entity );
-        resourceUpdate.setRemoteLastUpdated( LocalDateTime.now() );
+        resourceUpdate.setRemoteLastUpdated( Instant.now() );
         entity.setResourceUpdate( resourceUpdate );
 
         // must not be set externally
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/AbstractSubscriptionResourceBundleRetriever.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/AbstractSubscriptionResourceBundleRetriever.java
index 577722eb..7862382d 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/AbstractSubscriptionResourceBundleRetriever.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/AbstractSubscriptionResourceBundleRetriever.java
@@ -49,9 +49,8 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -87,11 +86,11 @@ protected AbstractSubscriptionResourceBundleRetriever( @Nonnull FhirContext fhir
     }
 
     @Nonnull
-    public ZonedDateTime poll( @Nonnull RemoteSubscriptionResource subscriptionResource, @Nonnull LocalDateTime remoteLastUpdated, int maxSearchCount, @Nonnull Consumer<Collection<SubscriptionResourceInfo>> consumer )
+    public Instant poll( @Nonnull RemoteSubscriptionResource subscriptionResource, @Nonnull Instant remoteLastUpdated, int maxSearchCount, @Nonnull Consumer<Collection<SubscriptionResourceInfo>> consumer )
     {
         final IGenericClient client = FhirClientUtils.createClient( fhirContext, subscriptionResource.getRemoteSubscription().getFhirEndpoint() );
-        ZonedDateTime lastUpdated = null;
-        LocalDateTime fromLastUpdated = remoteLastUpdated
+        Instant lastUpdated = null;
+        Instant fromLastUpdated = remoteLastUpdated
             .minus( subscriptionResource.getRemoteSubscription().getToleranceMillis(), ChronoUnit.MILLIS );
 
         final Set<SubscriptionResourceInfo> allResources = new HashSet<>();
@@ -107,7 +106,7 @@ public ZonedDateTime poll( @Nonnull RemoteSubscriptionResource subscriptionResou
             if ( lastUpdated == null )
             {
                 // last updated must only bet set on the first search invocation
-                lastUpdated = ZonedDateTime.now();
+                lastUpdated = Instant.now();
             }
             IBaseBundle bundle = client.search().forResource( resourceName ).cacheControl( new CacheControlDirective().setNoCache( true ) )
                 .whereMap( getQuery( subscriptionResource ) ).count( maxSearchCount ).lastUpdated( new DateRangeParam( Date.from( fromLastUpdated.atZone( zoneId ).toInstant() ), null ) )
@@ -118,7 +117,7 @@ public ZonedDateTime poll( @Nonnull RemoteSubscriptionResource subscriptionResou
                 for ( final IAnyResource resource : getResourceEntries( bundle ) )
                 {
                     resources.add( new SubscriptionResourceInfo( resource.getIdElement().getIdPart(),
-                        (resource.getMeta().getLastUpdated() == null) ? null : ZonedDateTime.ofInstant( resource.getMeta().getLastUpdated().toInstant(), zoneId ),
+                        (resource.getMeta().getLastUpdated() == null) ? null : resource.getMeta().getLastUpdated().toInstant(),
                         resource.getIdElement().getVersionIdPart() ) );
                 }
                 resources.forEach( r -> {
@@ -162,7 +161,7 @@ else if ( resources.size() < totalCount )
                         {
                             logger.debug( "Returned {} of {} for remote subscription resource {} with maximum requested {}.",
                                 resources.size(), totalCount, subscriptionResource.getId(), maxSearchCount );
-                            final ZonedDateTime maxLastUpdated = resources.stream().map( SubscriptionResourceInfo::getLastUpdated )
+                            final Instant maxLastUpdated = resources.stream().map( SubscriptionResourceInfo::getLastUpdated )
                                 .filter( lu -> (lu != null) ).max( Comparator.naturalOrder() ).orElse( null );
                             if ( maxLastUpdated == null )
                             {
@@ -170,15 +169,14 @@ else if ( resources.size() < totalCount )
                             }
                             else
                             {
-                                final LocalDateTime newFromLastUpdated = maxLastUpdated.toLocalDateTime();
-                                if ( newFromLastUpdated.equals( fromLastUpdated ) )
+                                if ( maxLastUpdated.equals( fromLastUpdated ) )
                                 {
                                     throw new RemoteRestHookProcessorException( "Remote subscription resource " + subscriptionResource.getId() + " last updated timestamp " +
                                         fromLastUpdated + " has not been changed after processing " + resources.size() + " resources (total " + totalCount + ")." );
                                 }
                                 else
                                 {
-                                    fromLastUpdated = newFromLastUpdated;
+                                    fromLastUpdated = maxLastUpdated;
                                     moreAvailable = true;
                                 }
                             }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/RemoteRestHookProcessorImpl.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/RemoteRestHookProcessorImpl.java
index 3e0e4687..9ce8325b 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/RemoteRestHookProcessorImpl.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/RemoteRestHookProcessorImpl.java
@@ -53,8 +53,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Nonnull;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -183,17 +184,16 @@ protected void receiveAuthenticated( @Nonnull RemoteRestHookRequest remoteRestHo
                 ", but no bundle retriever is available for that version." );
         }
 
-        final LocalDateTime remoteLastUpdated = remoteSubscriptionResourceUpdateRepository.getRemoteLastUpdated( remoteSubscriptionResource );
+        final Instant remoteLastUpdated = remoteSubscriptionResourceUpdateRepository.getRemoteLastUpdated( remoteSubscriptionResource );
         final AtomicLong count = new AtomicLong();
-        final ZonedDateTime lastUpdated = bundleRetriever.poll( remoteSubscriptionResource, remoteLastUpdated, processorConfig.getMaxSearchCount(), resources -> {
+        final Instant lastUpdated = bundleRetriever.poll( remoteSubscriptionResource, remoteLastUpdated, processorConfig.getMaxSearchCount(), resources -> {
             final String requestId = getCurrentRequestId();
-            final ZonedDateTime zonedProcessedAt = ZonedDateTime.now();
+            final Instant processedAt = Instant.now();
             final Set<String> processedVersionedIds = processedRemoteFhirResourceRepository.findByVersionedIds( remoteSubscriptionResource,
-                resources.stream().map( sr -> sr.toVersionString( zonedProcessedAt ) ).collect( Collectors.toList() ) );
+                resources.stream().map( sr -> sr.toVersionString( processedAt ) ).collect( Collectors.toList() ) );
 
-            final LocalDateTime processedAt = zonedProcessedAt.toLocalDateTime();
             resources.forEach( sr -> {
-                final String versionedId = sr.toVersionString( zonedProcessedAt );
+                final String versionedId = sr.toVersionString( processedAt );
                 if ( !processedVersionedIds.contains( versionedId ) )
                 {
                     // persist processed remote FHIR resource and
@@ -215,8 +215,7 @@ protected void receiveAuthenticated( @Nonnull RemoteRestHookRequest remoteRestHo
                 }
             } );
         } );
-        remoteSubscriptionResourceUpdateRepository.updateRemoteLastUpdated(
-            remoteSubscriptionResource, lastUpdated.toLocalDateTime() );
+        remoteSubscriptionResourceUpdateRepository.updateRemoteLastUpdated( remoteSubscriptionResource, lastUpdated );
 
         // Purging old data must not be done before and also must not be done asynchronously. The remote last updated
         // timestamp may be older than the purged data. And before purging the old data, the remote last updated
@@ -235,7 +234,7 @@ protected String getCurrentRequestId()
 
     protected void purgeOldestProcessed( @Nonnull RemoteSubscriptionResource remoteSubscriptionResource )
     {
-        final LocalDateTime from = LocalDateTime.now().minusMinutes( processorConfig.getMaxProcessedAgeMinutes() );
+        final Instant from = Instant.now().minus( processorConfig.getMaxProcessedAgeMinutes(), ChronoUnit.MINUTES );
         logger.debug( "Purging oldest processed remote subscription FHIR resources before {} for remote subscription resource {}.",
             from, remoteSubscriptionResource.getId() );
         final int count = processedRemoteFhirResourceRepository.deleteOldest( remoteSubscriptionResource, from );
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/SubscriptionResourceInfo.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/SubscriptionResourceInfo.java
index 3cd33e7d..e692b2e1 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/SubscriptionResourceInfo.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/remote/impl/SubscriptionResourceInfo.java
@@ -34,8 +34,6 @@
 import javax.annotation.Nullable;
 import java.io.Serializable;
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.Objects;
 
 /**
@@ -54,10 +52,10 @@ public class SubscriptionResourceInfo implements Serializable
 
     private final String version;
 
-    public SubscriptionResourceInfo( @Nonnull String id, @Nullable ZonedDateTime lastUpdated, @Nullable String version )
+    public SubscriptionResourceInfo( @Nonnull String id, @Nullable Instant lastUpdated, @Nullable String version )
     {
         this.id = id;
-        this.lastUpdated = (lastUpdated == null) ? 0 : lastUpdated.toInstant().toEpochMilli();
+        this.lastUpdated = (lastUpdated == null) ? 0 : lastUpdated.toEpochMilli();
         this.version = version;
     }
 
@@ -68,9 +66,9 @@ public String getId()
     }
 
     @Nullable
-    public ZonedDateTime getLastUpdated()
+    public Instant getLastUpdated()
     {
-        return (lastUpdated == 0) ? null : ZonedDateTime.ofInstant( Instant.ofEpochMilli( lastUpdated ), ZoneId.systemDefault() );
+        return (lastUpdated == 0) ? null : Instant.ofEpochMilli( lastUpdated );
     }
 
     @Nullable
@@ -97,7 +95,7 @@ public int hashCode()
     }
 
     @Nonnull
-    public String toVersionString( @Nonnull ZonedDateTime defaultLastUpdated )
+    public String toVersionString( @Nonnull Instant defaultLastUpdated )
     {
         return getId() + "|" + StringUtils.defaultString( getVersion(), "?" ) + "|" + lastUpdated;
     }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/RemoteFhirResource.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/RemoteFhirResource.java
index 3eb6ecf0..126ad1b7 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/RemoteFhirResource.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/repository/RemoteFhirResource.java
@@ -33,7 +33,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.Serializable;
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.UUID;
 
 /**
@@ -53,14 +53,14 @@ public class RemoteFhirResource implements Serializable
     private String fhirResourceVersion;
 
     @JsonInclude( JsonInclude.Include.NON_NULL )
-    private ZonedDateTime lastUpdated;
+    private Instant lastUpdated;
 
     public RemoteFhirResource()
     {
         super();
     }
 
-    public RemoteFhirResource( @Nonnull UUID remoteSubscriptionResourceId, @Nonnull String fhirResourceId, @Nullable String fhirResourceVersion, @Nullable ZonedDateTime lastUpdated )
+    public RemoteFhirResource( @Nonnull UUID remoteSubscriptionResourceId, @Nonnull String fhirResourceId, @Nullable String fhirResourceVersion, @Nullable Instant lastUpdated )
     {
         this.remoteSubscriptionResourceId = remoteSubscriptionResourceId;
         this.fhirResourceId = fhirResourceId;
@@ -98,12 +98,12 @@ public void setFhirResourceVersion( String fhirResourceVersion )
         this.fhirResourceVersion = fhirResourceVersion;
     }
 
-    public ZonedDateTime getLastUpdated()
+    public Instant getLastUpdated()
     {
         return lastUpdated;
     }
 
-    public void setLastUpdated( ZonedDateTime lastUpdated )
+    public void setLastUpdated( Instant lastUpdated )
     {
         this.lastUpdated = lastUpdated;
     }
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterAuthorities.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterAuthorities.java
index 1b9f7557..94d84644 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterAuthorities.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterAuthorities.java
@@ -55,7 +55,7 @@ public interface AdapterAuthorities
 
     String CODE_MAPPING_AUTHORITY_ROLE = ROLE_PREFIX + CODE_MAPPING_AUTHORITY;
 
-    String DATA_MAPPING_AUTHORITY = "ROLE_DATA_MAPPING";
+    String DATA_MAPPING_AUTHORITY = "DATA_MAPPING";
 
     String DATA_MAPPING_AUTHORITY_ROLE = ROLE_PREFIX + DATA_MAPPING_AUTHORITY;
 
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterSecurityConfig.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterSecurityConfig.java
index a05a1ea4..68a5a89b 100644
--- a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterSecurityConfig.java
+++ b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/security/AdapterSecurityConfig.java
@@ -101,7 +101,7 @@ public Set<GrantedAuthority> createGrantedAuthorities( @Nonnull Set<String> gran
     {
         final Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
         authoritiesMappings.forEach( ( adapterAuthority, dhisAuthority ) -> {
-            if ( grantedAuthorities.contains( dhisAuthority ) )
+            if ( grantedDhisAuthorities.contains( dhisAuthority ) )
             {
                 grantedAuthorities.add( new SimpleGrantedAuthority( adapterAuthority ) );
             }
diff --git a/fhir/src/main/resources/db/migration/production/V1.0.0.0_0_1__Initial.sql b/fhir/src/main/resources/db/migration/production/V1.0.0.0_0_1__Initial.sql
index 1ba3dce8..4feb512e 100644
--- a/fhir/src/main/resources/db/migration/production/V1.0.0.0_0_1__Initial.sql
+++ b/fhir/src/main/resources/db/migration/production/V1.0.0.0_0_1__Initial.sql
@@ -172,9 +172,9 @@ INSERT INTO fhir_authentication_method_enum VALUES('BASIC');
 CREATE TABLE fhir_constant (
   id              UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version         BIGINT                         NOT NULL,
-  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by VARCHAR(11),
-  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name            VARCHAR(230)                   NOT NULL,
   description     TEXT,
   category        VARCHAR(30)                    NOT NULL,
@@ -202,9 +202,9 @@ COMMENT ON COLUMN fhir_constant.value IS 'The value of the constant. The convers
 CREATE TABLE fhir_script (
   id              UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version         BIGINT                         NOT NULL,
-  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by VARCHAR(11),
-  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name            VARCHAR(230)                   NOT NULL,
   code            VARCHAR(100)                   NOT NULL,
   script_type     VARCHAR(30)                    NOT NULL,
@@ -237,9 +237,9 @@ CREATE TABLE fhir_script_source (
   id              UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version         BIGINT                         NOT NULL,
   script_id       UUID                           NOT NULL,
-  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by VARCHAR(11),
-  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   source_text     TEXT                           NOT NULL,
   source_type     VARCHAR(30)                    NOT NULL,
   CONSTRAINT fhir_script_source_pk PRIMARY KEY (id),
@@ -283,9 +283,9 @@ COMMENT ON COLUMN fhir_script_variable.variable IS 'The variable that is require
 CREATE TABLE fhir_script_argument (
   id              UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version         BIGINT                         NOT NULL,
-  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by VARCHAR(11),
-  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   script_id       UUID                           NOT NULL,
   name            VARCHAR(30)                    NOT NULL,
   data_type       VARCHAR(30)                    NOT NULL,
@@ -317,9 +317,9 @@ COMMENT ON COLUMN fhir_script_argument.script_id IS 'The reference to the script
 CREATE TABLE fhir_executable_script (
   id              UUID NOT NULL DEFAULT UUID_GENERATE_V4(),
   version         BIGINT                         NOT NULL,
-  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by VARCHAR(11),
-  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   script_id       UUID NOT NULL,
   name            VARCHAR(230) NOT NULL,
   code            VARCHAR(100) NOT NULL,
@@ -367,9 +367,9 @@ COMMENT ON COLUMN fhir_executable_script_argument.enabled IS 'Specifies if this
 CREATE TABLE fhir_code_category (
   id              UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version         BIGINT                         NOT NULL,
-  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at      TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by VARCHAR(11),
-  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name            VARCHAR(230)                   NOT NULL,
   code            VARCHAR(50)                    NOT NULL,
   description     TEXT,
@@ -390,9 +390,9 @@ COMMENT ON COLUMN fhir_code_category.description IS 'The detailed description th
 CREATE TABLE fhir_code (
   id               UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version          BIGINT                         NOT NULL,
-  created_at       TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at       TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by  VARCHAR(11),
-  last_updated_at  TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at  TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   code_category_id UUID                           NOT NULL,
   name             VARCHAR(230)                   NOT NULL,
   code             VARCHAR(50)                    NOT NULL,
@@ -422,9 +422,9 @@ COMMENT ON COLUMN fhir_code.description IS 'The detailed description that descri
 CREATE TABLE fhir_code_set (
   id               UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version          BIGINT                         NOT NULL,
-  created_at       TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at       TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by  VARCHAR(11),
-  last_updated_at  TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at  TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   code_category_id UUID                           NOT NULL,
   name             VARCHAR(230)                   NOT NULL,
   code             VARCHAR(50)                    NOT NULL,
@@ -465,9 +465,9 @@ COMMENT ON COLUMN fhir_code_set_value.enabled IS 'Disabling a code of the code s
 CREATE TABLE fhir_system (
   id                    UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version               BIGINT                         NOT NULL,
-  created_at            TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at            TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by       VARCHAR(11),
-  last_updated_at       TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at       TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name                  VARCHAR(230)                   NOT NULL,
   code                  VARCHAR(50)                    NOT NULL,
   system_uri            VARCHAR(120)                   NOT NULL,
@@ -495,9 +495,9 @@ COMMENT ON COLUMN fhir_system.system_uri IS 'The system URI (e.g. http://hl7.org
 CREATE TABLE fhir_system_code (
   id                UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version           BIGINT                         NOT NULL,
-  created_at        TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at        TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by   VARCHAR(11),
-  last_updated_at   TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at   TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   system_id         UUID                           NOT NULL,
   code_id           UUID                           NOT NULL,
   system_code       VARCHAR(120)                   NOT NULL,
@@ -524,9 +524,9 @@ COMMENT ON COLUMN fhir_system_code.system_code_value IS 'Combination of system U
 CREATE TABLE fhir_rule (
   id                      UUID                           NOT NULL     DEFAULT UUID_GENERATE_V4(),
   version                 BIGINT                         NOT NULL,
-  created_at              TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL     DEFAULT CURRENT_TIMESTAMP,
+  created_at              TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL     DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by         VARCHAR(11),
-  last_updated_at         TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL     DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at         TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL     DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name                    VARCHAR(230)                   NOT NULL,
   description             TEXT,
   enabled                 BOOLEAN                        NOT NULL     DEFAULT TRUE,
@@ -591,9 +591,9 @@ COMMENT ON COLUMN fhir_tracked_entity_rule.tracked_entity_identifier_ref IS 'The
 CREATE TABLE fhir_tracker_program (
   id                            UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version                       BIGINT                         NOT NULL,
-  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by               VARCHAR(11),
-  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name                          VARCHAR(230)                   NOT NULL,
   description                   TEXT,
   program_ref                   VARCHAR(230)                   NOT NULL,
@@ -645,9 +645,9 @@ COMMENT ON COLUMN fhir_tracker_program.tracked_entity_rule_id IS 'References the
 CREATE TABLE fhir_tracker_program_stage (
   id                            UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version                       BIGINT                         NOT NULL,
-  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by               VARCHAR(11),
-  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name                          VARCHAR(230)                   NOT NULL,
   description                   TEXT,
   program_id                    UUID                           NOT NULL,
@@ -766,9 +766,9 @@ CREATE TABLE fhir_resource_mapping (
   id                                UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version                           BIGINT                         NOT NULL,
   fhir_resource_type                VARCHAR(30)                    NOT NULL,
-  created_at                        TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at                        TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by                   VARCHAR(11),
-  last_updated_at                   TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at                   TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   tei_lookup_script_id              UUID,
   enrollment_org_lookup_script_id   UUID,
   event_org_lookup_script_id        UUID,
@@ -823,9 +823,9 @@ COMMENT ON COLUMN fhir_resource_mapping.effective_date_lookup_script_id IS 'Refe
 CREATE TABLE fhir_remote_subscription (
   id                            UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version                       BIGINT                         NOT NULL,
-  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by               VARCHAR(11),
-  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   name                          VARCHAR(50)                    NOT NULL,
   code                          VARCHAR(20)                    NOT NULL,
   enabled                       BOOLEAN                        NOT NULL DEFAULT TRUE,
@@ -891,9 +891,9 @@ COMMENT ON COLUMN fhir_remote_subscription_header.secure IS 'Specifies if the va
 CREATE TABLE fhir_remote_subscription_system (
   id                            UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version                       BIGINT                         NOT NULL,
-  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at                    TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by               VARCHAR(11),
-  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   remote_subscription_id        UUID                           NOT NULL,
   fhir_resource_type            VARCHAR(30)                    NOT NULL,
   system_id                     UUID                           NOT NULL,
@@ -919,9 +919,9 @@ COMMENT ON COLUMN fhir_remote_subscription_system.code_prefix IS 'Prefix that is
 CREATE TABLE fhir_remote_subscription_resource (
   id                       UUID                           NOT NULL DEFAULT UUID_GENERATE_V4(),
   version                  BIGINT                         NOT NULL,
-  created_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  created_at               TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   last_updated_by          VARCHAR(11),
-  last_updated_at          TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  last_updated_at          TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   remote_subscription_id   UUID                           NOT NULL,
   fhir_resource_type       VARCHAR(30)                    NOT NULL,
   fhir_criteria_parameters VARCHAR(200),
@@ -948,7 +948,7 @@ COMMENT ON COLUMN fhir_remote_subscription_resource.fhir_subscription_id IS 'The
 
 CREATE TABLE fhir_remote_subscription_resource_update (
   id                       UUID                           NOT NULL,
-  remote_last_updated      TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  remote_last_updated      TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   CONSTRAINT fhir_remote_subscription_resource_update_pk PRIMARY KEY (id),
   CONSTRAINT fhir_remote_subscription_resource_update_fk1 FOREIGN KEY (id) REFERENCES fhir_remote_subscription_resource (id) ON DELETE CASCADE
 );
@@ -958,7 +958,7 @@ COMMENT ON COLUMN fhir_remote_subscription_resource_update.remote_last_updated I
 CREATE TABLE fhir_queued_remote_subscription_request (
   id         UUID                           NOT NULL,
   request_id VARCHAR(50)                    NOT NULL,
-  queued_at  TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  queued_at  TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   CONSTRAINT fhir_queued_remote_subscription_request_pk PRIMARY KEY(id),
   CONSTRAINT fhir_queued_remote_subscription_request_fk1 FOREIGN KEY(id) REFERENCES fhir_remote_subscription_resource(id) ON DELETE CASCADE
 );
@@ -970,7 +970,7 @@ COMMENT ON COLUMN fhir_queued_remote_subscription_request.queued_at IS 'The time
 CREATE TABLE fhir_processed_remote_resource (
   remote_subscription_resource_id   UUID         NOT NULL,
   versioned_fhir_resource_id        VARCHAR(120) NOT NULL,
-  processed_at                      TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  processed_at                      TIMESTAMP(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   CONSTRAINT fhir_processed_remote_resource_pk PRIMARY KEY (remote_subscription_resource_id, versioned_fhir_resource_id),
   CONSTRAINT fhir_processed_remote_resource_fk1 FOREIGN KEY(remote_subscription_resource_id) REFERENCES fhir_remote_subscription_resource(id) ON DELETE CASCADE
 );
@@ -985,7 +985,7 @@ CREATE TABLE fhir_queued_remote_resource (
   remote_subscription_resource_id   UUID                           NOT NULL,
   fhir_resource_id                  VARCHAR(80)                    NOT NULL,
   request_id                        VARCHAR(50)                    NOT NULL,
-  queued_at                         TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  queued_at                         TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
   CONSTRAINT fhir_queued_remote_resource_pk PRIMARY KEY(remote_subscription_resource_id, fhir_resource_id ),
   CONSTRAINT fhir_queued_remote_resource_fk1 FOREIGN KEY(remote_subscription_resource_id) REFERENCES fhir_remote_subscription_resource(id) ON DELETE CASCADE
 );
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/AbstractJpaRepositoryTest.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/AbstractJpaRepositoryTest.java
new file mode 100644
index 00000000..047b6171
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/AbstractJpaRepositoryTest.java
@@ -0,0 +1,83 @@
+package org.dhis2.fhir.adapter.fhir;
+
+/*
+ * Copyright (c) 2004-2018, 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.fhir.data.DataBasePackage;
+import org.dhis2.fhir.adapter.fhir.metadata.MetadataBasePackage;
+import org.dhis2.fhir.adapter.jackson.JacksonConfig;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Abstract base class for JPA Repository dependent tests.
+ *
+ * @author volsch
+ */
+@RunWith( SpringRunner.class )
+@EnableAutoConfiguration
+@ContextConfiguration( classes = { JacksonAutoConfiguration.class, WebMvcAutoConfiguration.class, SpringDataWebAutoConfiguration.class, JacksonConfig.class, TestConfig.class, TestWebSecurityConfig.class, RepositoryRestMvcConfiguration.class } )
+@ComponentScan( basePackageClasses = { DataBasePackage.class, MetadataBasePackage.class } )
+@EntityScan( basePackageClasses = { DataBasePackage.class, MetadataBasePackage.class } )
+@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK )
+@TestPropertySource( "classpath:test.properties" )
+@AutoConfigureMockMvc
+@AutoConfigureRestDocs( outputDir = "target/snippets/{class-name}/{method-name}" )
+@DataJpaTest
+public abstract class AbstractJpaRepositoryTest
+{
+    @Autowired
+    protected MockMvc mockMvc;
+
+    @Nonnull
+    protected RequestPostProcessor createRequestPostProcessor()
+    {
+        return request -> {
+            request.setRemotePort( 8081 );
+            return request;
+        };
+    }
+}
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/TestConfig.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/TestConfig.java
new file mode 100644
index 00000000..a3f22251
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/TestConfig.java
@@ -0,0 +1,98 @@
+package org.dhis2.fhir.adapter.fhir;
+
+/*
+ * Copyright (c) 2004-2018, 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.converter.ZonedDateTimeToDateConverter;
+import org.dhis2.fhir.adapter.script.ScriptCompiler;
+import org.dhis2.fhir.adapter.script.impl.ScriptCompilerImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
+import org.springframework.data.rest.core.mapping.RepositoryDetectionStrategy;
+import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer;
+import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.annotation.Nonnull;
+import java.time.ZonedDateTime;
+import java.util.Date;
+
+/**
+ * Test configuration.
+ *
+ * @author volsch4
+ */
+@Configuration
+public class TestConfig
+{
+    @Nonnull
+    @Bean
+    protected ScriptCompiler scriptCompiler()
+    {
+        return new ScriptCompilerImpl( "nashorn" );
+    }
+
+    @Bean
+    @Nonnull
+    public WebMvcConfigurer mvcConfigurer()
+    {
+        return new WebMvcConfigurer()
+        {
+            @Override
+            public void addFormatters( @Nonnull FormatterRegistry registry )
+            {
+                registry.addConverter( ZonedDateTime.class, Date.class, new ZonedDateTimeToDateConverter() );
+            }
+        };
+    }
+
+    @Nonnull
+    @Bean
+    protected GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer()
+    {
+        return new GenericJackson2JsonRedisSerializer();
+    }
+
+    @Nonnull
+    @Bean
+    protected RepositoryRestConfigurer repositoryRestConfigurer()
+    {
+        return new RepositoryRestConfigurerAdapter()
+        {
+            @Override
+            public void configureRepositoryRestConfiguration( RepositoryRestConfiguration config )
+            {
+                config.setRepositoryDetectionStrategy( RepositoryDetectionStrategy.RepositoryDetectionStrategies.ANNOTATED );
+                config.setBasePath( "/api" );
+            }
+        };
+    }
+}
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/TestWebSecurityConfig.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/TestWebSecurityConfig.java
new file mode 100644
index 00000000..0a87da37
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/TestWebSecurityConfig.java
@@ -0,0 +1,73 @@
+package org.dhis2.fhir.adapter.fhir;
+
+/*
+ * Copyright (c) 2004-2018, 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.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Security configuration of tests.
+ *
+ * @author volsch
+ */
+@Configuration
+@EnableWebSecurity
+public class TestWebSecurityConfig extends WebSecurityConfigurerAdapter
+{
+    protected static final String DHIS_BASIC_REALM = "DHIS2";
+
+    @Override
+    protected void configure( @Nonnull HttpSecurity http ) throws Exception
+    {
+        http.sessionManagement().sessionCreationPolicy( SessionCreationPolicy.STATELESS );
+        http.csrf().disable();
+        http
+            .authorizeRequests()
+            .antMatchers( HttpMethod.OPTIONS, "/api/**" ).permitAll()
+            .anyRequest().authenticated()
+            .and()
+            .httpBasic().realmName( DHIS_BASIC_REALM );
+    }
+
+    @Override
+    protected void configure( AuthenticationManagerBuilder auth ) throws Exception
+    {
+        auth.inMemoryAuthentication()
+            .withUser( "code" )
+            .password( "code" )
+            .roles( "CODE_MAPPING" );
+    }
+}
diff --git a/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CodeCategoryRepositoryTest.java b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CodeCategoryRepositoryTest.java
new file mode 100644
index 00000000..f53b5e55
--- /dev/null
+++ b/fhir/src/test/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CodeCategoryRepositoryTest.java
@@ -0,0 +1,64 @@
+package org.dhis2.fhir.adapter.fhir.metadata.repository;
+
+/*
+ * Copyright (c) 2004-2018, 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.apache.commons.io.IOUtils;
+import org.dhis2.fhir.adapter.fhir.AbstractJpaRepositoryTest;
+import org.junit.Test;
+import org.springframework.http.MediaType;
+import org.springframework.restdocs.payload.JsonFieldType;
+import org.springframework.security.test.context.support.WithMockUser;
+
+import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+/**
+ * Tests for {@link CodeCategoryRepository}.
+ *
+ * @author volsch
+ */
+public class CodeCategoryRepositoryTest extends AbstractJpaRepositoryTest
+{
+    @WithMockUser( username = "2h2maqu827da1", password = "code_test", roles = "CODE_MAPPING" )
+    @Test
+    public void createCodeCategory() throws Exception
+    {
+        mockMvc.perform( post( "/api/codeCategories" ).with( createRequestPostProcessor() ).contentType( MediaType.APPLICATION_JSON ).accept( MediaType.APPLICATION_JSON )
+            .content( IOUtils.resourceToByteArray( "/org/dhis2/fhir/adapter/fhir/metadata/repository/createCodeCategory.json" ) ) )
+            .andExpect( status().isCreated() )
+            .andDo( document( "{method-name}/", requestFields(
+                fieldWithPath( "name" ).description( "The unique name of the code category." ).type( JsonFieldType.STRING ),
+                fieldWithPath( "code" ).description( "The unique code of the code category." ).type( JsonFieldType.STRING ),
+                fieldWithPath( "description" ).description( "The detailed description that describes for which purpose the code category is used." ).type( JsonFieldType.STRING ).optional().attributes()
+            ) ) );
+    }
+}
\ No newline at end of file
diff --git a/fhir/src/test/resources/logback-test.xml b/fhir/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..949bdf78
--- /dev/null
+++ b/fhir/src/test/resources/logback-test.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2004-2018, 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.
+  -->
+
+<configuration>
+  <include resource="org/springframework/boot/logging/logback/base.xml" />
+  <root level="info" />
+</configuration>
diff --git a/fhir/src/test/resources/org/dhis2/fhir/adapter/fhir/metadata/repository/createCodeCategory.json b/fhir/src/test/resources/org/dhis2/fhir/adapter/fhir/metadata/repository/createCodeCategory.json
new file mode 100644
index 00000000..af29e2ca
--- /dev/null
+++ b/fhir/src/test/resources/org/dhis2/fhir/adapter/fhir/metadata/repository/createCodeCategory.json
@@ -0,0 +1,5 @@
+{
+  "name": "Test Code Category",
+  "code": "TEST_CODE_CATEGORY",
+  "description": "This is a test code category."
+}
diff --git a/fhir/src/test/resources/test.properties b/fhir/src/test/resources/test.properties
new file mode 100644
index 00000000..34c38a22
--- /dev/null
+++ b/fhir/src/test/resources/test.properties
@@ -0,0 +1,36 @@
+#
+# Copyright (c) 2004-2018, 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.
+#
+
+
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.username=sa
+spring.datasource.driver-class-name=org.h2.Driver
+
+spring.jpa.properties.hibernate.jdbc.time_zone=UTC
+
+spring.flyway.enabled=false
diff --git a/pom.xml b/pom.xml
index 42325063..bb613d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,20 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
   <dependencyManagement>
     <dependencies>
       <dependency>