diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index f632e12..eede8f9 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -13,6 +13,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -40,6 +41,7 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Profile;
 import org.gcube.common.resources.gcore.utils.Group;
 import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationProvider;
 import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationToken;
+import org.gcube.data.analysis.tabulardata.commons.utils.Licence;
 import org.gcube.data.analysis.tabulardata.commons.webservice.types.TemplateDescription;
 import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationDefinition;
 import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
@@ -89,7 +91,6 @@ import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource;
 import org.gcube.data.analysis.tabulardata.service.tabular.TabularResourceId;
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.AgencyMetadata;
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.DescriptionMetadata;
-import org.gcube.data.analysis.tabulardata.service.tabular.metadata.Licence;
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.LicenceMetadata;
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.NameMetadata;
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.RightsMetadata;
@@ -1496,7 +1497,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 	 * @param tabResource
 	 */
 	protected void syncTRMetaData(TabularResource tr, TabResource tabResource) {
-		// Date date = Calendar.getInstance().getTime();
+		
 		logger.debug("TRservice [id:" + tr.getId() + " ,creationDate:"
 				+ tr.getCreationDate() + "]");
 		logger.debug("TabResource [name:" + tabResource.getName()
@@ -1517,7 +1518,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 		if(tabResource.getValidFrom()!=null&& !tabResource.getValidFrom().isEmpty()){
 			try{
 				Date dateF=sdfDate.parse(tabResource.getValidFrom());
-				Calendar validFromC= Calendar.getInstance();
+				GregorianCalendar validFromC= new GregorianCalendar();
 				validFromC.setTime(dateF);
 				ValidSinceMetadata validSince=new ValidSinceMetadata();
 				validSince.setValue(validFromC);
@@ -1530,7 +1531,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 		if(tabResource.getValidUntilTo()!=null&& !tabResource.getValidUntilTo().isEmpty()){
 			try{
 				Date dateU=sdfDate.parse(tabResource.getValidUntilTo());
-				Calendar validUntilToC= Calendar.getInstance();
+				GregorianCalendar validUntilToC= new GregorianCalendar();
 				validUntilToC.setTime(dateU);
 				ValidUntilMetadata validUntil=new ValidUntilMetadata();
 				validUntil.setValue(validUntilToC);
@@ -4410,7 +4411,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			if(tabResource.getValidFrom()!=null&& !tabResource.getValidFrom().isEmpty()){
 				try{
 					Date dateF=sdfDate.parse(tabResource.getValidFrom());
-					Calendar validFromC= Calendar.getInstance();
+					GregorianCalendar validFromC= new GregorianCalendar();
 					validFromC.setTime(dateF);
 					ValidSinceMetadata validSince=new ValidSinceMetadata();
 					validSince.setValue(validFromC);
@@ -4423,7 +4424,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			if(tabResource.getValidUntilTo()!=null&& !tabResource.getValidUntilTo().isEmpty()){
 				try{
 					Date dateU=sdfDate.parse(tabResource.getValidUntilTo());
-					Calendar validUntilToC= Calendar.getInstance();
+					GregorianCalendar validUntilToC= new GregorianCalendar();
 					validUntilToC.setTime(dateU);
 					ValidUntilMetadata validUntil=new ValidUntilMetadata();
 					validUntil.setValue(validUntilToC);
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/LicenceMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/LicenceMap.java
index 2b55bec..9cc49ef 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/LicenceMap.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/LicenceMap.java
@@ -1,6 +1,8 @@
 package org.gcube.portlets.user.td.gwtservice.server.trservice;
 
-import org.gcube.data.analysis.tabulardata.service.tabular.metadata.Licence;
+import org.gcube.data.analysis.tabulardata.commons.utils.Licence;
+
+
 
 /**
  *