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 c021628..80923c9 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
@@ -36,6 +36,9 @@ import org.gcube.data.analysis.tabulardata.service.tabular.metadata.CreationDate
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.DescriptionMetadata;
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.NameMetadata;
 import org.gcube.data.analysis.tabulardata.service.tabular.metadata.RightsMetadata;
+import org.gcube.datapublishing.sdmx.api.model.SDMXRegistryDescriptor;
+import org.gcube.datapublishing.sdmx.api.model.SDMXRegistryInterfaceType;
+import org.gcube.datapublishing.sdmx.impl.model.GCubeSDMXRegistryDescriptor;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTService;
 import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession;
 import org.gcube.portlets.user.td.gwtservice.server.storage.FilesStorage;
@@ -442,6 +445,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 		map.put("Agency", codelist.getAgencyId());
 		map.put("Id", codelist.getId());
 		map.put("Version", codelist.getVersion());
+		
+		//TODO-GP: Get registry url from client
+		
+		SDMXRegistryDescriptor descriptor = new GCubeSDMXRegistryDescriptor();
+		map.put("registryBaseUrl", descriptor.getUrl(SDMXRegistryInterfaceType.RESTV2_1));
+		
 
 		return map;