diff --git a/pom.xml b/pom.xml
index 5115e64b55826e5226db6e290e5f8976154e49dd..767b7f99185d4b62de61f066bef57daab515fa63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,11 @@
pom
import
+
+ org.json
+ json
+ 20210307
+
@@ -415,6 +420,30 @@
exec
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.2.5
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.12
+
+
+
+ prepare-agent
+
+
+
+ report
+ prepare-package
+
+ report
+
+
+
+
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
index fd24434d757adfb8cbb804856f79930fedffe47c..6b65eb616ce5d634898dcadc46f8e94a39f83f9d 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
@@ -22,6 +22,7 @@ package org.etsi.osl.tmf.sim638.service;
import java.io.UnsupportedEncodingException;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -29,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;
import org.apache.commons.logging.Log;
@@ -192,7 +194,7 @@ public class ServiceRepoService {
result.put("serviceOrder", new ArrayList