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 9fbaaf7..c8a8e9f 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
@@ -2970,12 +2970,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 					.getTabularResource(new TabularResourceId(Long.valueOf(trId
 							.getId())));
 
-			Collection<TabularResourceMetadata> trMetas = tr.getAllMetadata();
+			Collection<TabularResourceMetadata<?>> trMetas = tr.getAllMetadata();
 
 			logger.debug("GetTRMetadata size: " + trMetas.size());
 			ArrayList<TRMetadata> listTRMetadata = new ArrayList<TRMetadata>();
 
-			for (TabularResourceMetadata trMetadata : trMetas) {
+			for (TabularResourceMetadata<?> trMetadata : trMetas) {
 				if (trMetadata instanceof org.gcube.data.analysis.tabulardata.service.tabular.metadata.DescriptionMetadata) {
 					TRDescriptionMetadata trDescriptionMetadata = new TRDescriptionMetadata();
 					trDescriptionMetadata
diff --git a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java
index 0cb2770..a371969 100644
--- a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java
+++ b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestMetadata.java
@@ -118,11 +118,11 @@ public class TestMetadata {
 	}
 
 	protected ArrayList<TRMetadata> showMetadata(TabularResource tr) {
-		Collection<TabularResourceMetadata> trMetas = tr.getAllMetadata();
+		Collection<TabularResourceMetadata<?>> trMetas = tr.getAllMetadata();
 
 		ArrayList<TRMetadata> listTRMetadata = new ArrayList<TRMetadata>();
 
-		for (TabularResourceMetadata trMetadata : trMetas) {
+		for (TabularResourceMetadata<?> trMetadata : trMetas) {
 			if (trMetadata instanceof org.gcube.data.analysis.tabulardata.service.tabular.metadata.DescriptionMetadata) {
 				TRDescriptionMetadata trDescriptionMetadata = new TRDescriptionMetadata();
 				trDescriptionMetadata