diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
index 98d4bab..152bc50 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
@@ -95,7 +95,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 			LOG.debug("Built " + ConcessioniFormCardTitle.INFORMAZIONI_DI_PROGETTO + " as server obj: " + concessione);
 
 			// saving into back-end
-			//SessionUtil.getCurrentContext(this.getThreadLocalRequest(), true);
+			SessionUtil.getCurrentContext(this.getThreadLocalRequest(), true);
 			manager = ManagerFactory.registerNew(concessione);
 			
 			// ABSTRACT_RELAZIONE_DI_SCAVO
@@ -180,17 +180,19 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 						"Error: no data found for " + ConcessioniFormCardTitle.PIANTA_DI_FINE_SCAVO.getTitle());
 
 			listGDB = list.get(0).getListGDB();
-			GenericDatasetBean pfs = listGDB.get(0);
-			LOG.debug("\n\n");
-			LOG.debug(ConcessioniFormCardTitle.PIANTA_DI_FINE_SCAVO + " building with client obj: " + pfs);
-			LayerConcessione layerPfs = ConvertToServiceModel.toLayerConcessione(pfs);
-			LOG.debug("Built " + ConcessioniFormCardTitle.PIANTA_DI_FINE_SCAVO + " as server obj: " + layerPfs);
-			for (FileUploaded fileUploaded : pfs.getFilesUploaded()) {
-				LOG.debug("Adding uploaded file: " + fileUploaded.getFileName() + " to " + layerPfs);
-				FileInputStream fis = new FileInputStream(fileUploaded.getTempSystemPath());
-				InputStreamDescriptor isd = new InputStreamDescriptor(fis, fileUploaded.getFileName());
-				// saving into back-end
-				manager.addPiantaFineScavo(layerPfs, isd);
+			//Managing N:N
+			for (GenericDatasetBean pfs : listGDB) {
+				LOG.debug("\n\n");
+				LOG.debug(ConcessioniFormCardTitle.PIANTA_DI_FINE_SCAVO + " building with client obj: " + pfs);
+				LayerConcessione layerPfs = ConvertToServiceModel.toLayerConcessione(pfs);
+				LOG.debug("Built " + ConcessioniFormCardTitle.PIANTA_DI_FINE_SCAVO + " as server obj: " + layerPfs);
+				for (FileUploaded fileUploaded : pfs.getFilesUploaded()) {
+					LOG.debug("Adding uploaded file: " + fileUploaded.getFileName() + " to " + layerPfs);
+					FileInputStream fis = new FileInputStream(fileUploaded.getTempSystemPath());
+					InputStreamDescriptor isd = new InputStreamDescriptor(fis, fileUploaded.getFileName());
+					// saving into back-end
+					manager.addPiantaFineScavo(layerPfs, isd);
+				}
 			}
 		} catch (Exception e) {
 			LOG.error("Error on converting form data: ", e);