diff --git a/src/main/java/com/inteligr8/activiti/model/Job.java b/src/main/java/com/inteligr8/activiti/model/Job.java
index a2e34ad..b22d2ea 100644
--- a/src/main/java/com/inteligr8/activiti/model/Job.java
+++ b/src/main/java/com/inteligr8/activiti/model/Job.java
@@ -31,7 +31,7 @@ public class Job extends Datum {
     private String exceptionMessage;
     @JsonProperty("dueDate")
     private OffsetDateTime dueDate;
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     @JsonProperty("tenantId")
     private String tenantId;
 
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
index 5e1b8ae..dead5cf 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
@@ -45,10 +45,10 @@ public class HistoricProcessInstanceQueryRepresentation {
     @JsonProperty("finished")
     private Boolean finished;
     @JsonProperty("finishedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime finishedAfter;
     @JsonProperty("finishedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime finishedBefore;
     @JsonProperty("includeProcessVariables")
     private Boolean includeProcessVariables;
@@ -73,10 +73,10 @@ public class HistoricProcessInstanceQueryRepresentation {
     @JsonProperty("start")
     private Integer start;
     @JsonProperty("startedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime startedAfter;
     @JsonProperty("startedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime startedBefore;
     @JsonProperty("startedBy")
     private String startedBy;
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java
index cdc2f47..d962ed0 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java
@@ -99,33 +99,33 @@ public class HistoricTaskQueryRepresentation {
     @JsonProperty("taskCandidateGroup")
     private String taskCandidateGroup;
     @JsonProperty("taskCreatedOn")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime taskCreated;
     @JsonProperty("taskCreatedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime taskCreatedBefore;
     @JsonProperty("taskCreatedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime taskCreatedAfter;
     @JsonProperty("dueDate")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueDate;
     @JsonProperty("dueDateBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueDateBefore;
     @JsonProperty("dueDateAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueDateAfter;
     @JsonProperty("withoutDueDate")
     private Boolean withoutDueDate;
     @JsonProperty("taskCompletedOn")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime taskCompleted;
     @JsonProperty("taskCompletedBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime taskCompletedBefore;
     @JsonProperty("taskCompletedAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime taskCompletedAfter;
     @JsonProperty("taskDeleteReason")
     private String taskDeleteReason;
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java b/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java
index 570da23..0be2378 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java
@@ -39,7 +39,7 @@ public class ProcessInstance extends Datum {
     @JsonProperty("businessKey")
     private String businessKey;
     @JsonProperty("ended")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime ended;
     @JsonProperty("graphicalNotationDefined")
     private Boolean graphicalNotationDefined;
@@ -64,7 +64,7 @@ public class ProcessInstance extends Datum {
     @JsonProperty("startFormDefined")
     private Boolean startFormDefined;
     @JsonProperty("started")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime started;
     @JsonProperty("startedBy")
     private UserLight startedBy;
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java b/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java
index fa15626..010fef6 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java
@@ -56,18 +56,18 @@ public class Task extends Datum {
     @JsonProperty("category")
     private String category;
     @JsonProperty("created")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime created;
     @JsonProperty("description")
     private String description;
     @JsonProperty("dueDate")
     private OffsetDateTime dueDate;
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     @JsonProperty("duration")
     private Long duration;
     @JsonProperty("endDate")
     private OffsetDateTime endDate;
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     @JsonProperty("executionId")
     private String executionId;
     @JsonProperty("formKey")
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java
index 93c9b8b..181b928 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java
@@ -39,10 +39,10 @@ public class TaskFilter extends Datum {
     @JsonProperty("assignment")
     private String assignment;
     @JsonProperty("dueBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueBefore;
     @JsonProperty("dueAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueAfter;
     @JsonProperty("processDefinitionId")
     private String processDefinitionId;
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java
index 0497734..b156dc8 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java
@@ -54,10 +54,10 @@ public class TaskQueryRepresentation {
     @JsonProperty("text")
     private String text;
     @JsonProperty("dueBefore")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueBefore;
     @JsonProperty("dueAfter")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueAfter;
     @JsonProperty("taskId")
     private String taskId;
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java
index adbed7a..ddcad38 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java
@@ -37,7 +37,7 @@ public class TaskUpdate {
     @JsonProperty("descriptionSet")
     private Boolean descriptionSet;
     @JsonProperty("dueDate")
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXX")
     private OffsetDateTime dueDate;
     @JsonProperty("dueDateSet")
     private Boolean dueDateSet;