diff --git a/D4S_UCDs/PRE/preVRE/Concessioni_estere.json b/D4S_UCDs/PRE/preVRE/Concessioni_estere.json
index 6be515c..2b03d75 100644
--- a/D4S_UCDs/PRE/preVRE/Concessioni_estere.json
+++ b/D4S_UCDs/PRE/preVRE/Concessioni_estere.json
@@ -98,15 +98,43 @@
     }
   },
   "_dataAccessPolicies": [
-    {"_policy": {"_read": "any","_write": "any"},
-      "_roles": ["Data-Manager"]},
-    {"_policy": {"_read": "own","_write": "own"},
-      "_roles": ["Data-Editor"]},
-      {"_policy": {"_read": "any","_write": "none"},
-      "_roles": ["Member"],
-      "_enforcer": {"_filter": "{\"_lifecycleInformation._phase\" :  {\"$eq\" :  \"Published\"}}"}},
-      {"_policy": {"_read": "none","_write": "none"},
-      "_roles": []}
+    {
+      "_policy": {
+        "_read": "any",
+        "_write": "any"
+      },
+      "_roles": [
+        "Data-Manager"
+      ]
+    },
+    {
+      "_policy": {
+        "_read": "own",
+        "_write": "own"
+      },
+      "_roles": [
+        "Data-Editor"
+      ]
+    },
+    {
+      "_policy": {
+        "_read": "any",
+        "_write": "none"
+      },
+      "_roles": [
+        "Member"
+      ],
+      "_enforcer": {
+        "_filter": "{\"_lifecycleInformation._phase\" :  {\"$eq\" :  \"Published\"}}"
+      }
+    },
+    {
+      "_policy": {
+        "_read": "none",
+        "_write": "none"
+      },
+      "_roles": []
+    }
   ],
   "_handlers": [
     {
@@ -184,21 +212,11 @@
             "path": "$._theDocument.descrizioneContenuto",
             "type": "TEXT"
           },
-          {
-            "name": "autore",
-            "path": "$._theDocument.authors",
-            "type": "TEXT"
-          },
           {
             "name": "contributore",
             "path": "$._theDocument.contributore",
             "type": "TEXT"
           },
-          {
-            "name": "titolare",
-            "path": "$._theDocument.titolari",
-            "type": "TEXT"
-          },
           {
             "name": "responsabile",
             "path": "$._theDocument.responsabile",
@@ -209,6 +227,16 @@
             "path": "$._theDocument.editore",
             "type": "TEXT"
           },
+          {
+            "name": "ufficio_competente",
+            "path": "$._theDocument.ufficioCompetente",
+            "type": "TEXT"
+          },
+          {
+            "name": "funzionario_responsabile",
+            "path": "$._theDocument.funzionarioResponsabile",
+            "type": "TEXT"
+          },
           {
             "name": "finanziamento",
             "path": "$._theDocument.fontiFinanziamento",
@@ -244,11 +272,6 @@
             "path": "$._info._access._license",
             "type": "TEXT"
           },
-          {
-            "name": "titolare_licenza",
-            "path": "$._theDocument.titolareLicenza",
-            "type": "TEXT"
-          },
           {
             "name": "accesso",
             "path": "$._info._access._license",
@@ -258,6 +281,56 @@
             "name": "parole_chiave",
             "path": "$._theDocument.paroleChiaveLibere",
             "type": "TEXT"
+          },
+          {
+            "name": "modalita_individuazione",
+            "path": "$._theDocument.modalitaIndividuazione",
+            "type": "TEXT"
+          },
+          {
+            "name": "contesto_indagine",
+            "path": "$._theDocument.contestoIndagine",
+            "type": "TEXT"
+          },
+          {
+            "name": "denominazione",
+            "path": "$._theDocument.denominazione",
+            "type": "TEXT"
+          },
+          {
+            "name": "stato_attuale",
+            "path": "$._theDocument.statoAttuale",
+            "type": "TEXT"
+          },
+          {
+            "name": "accessibilita",
+            "path": "$._theDocument.accessibilita",
+            "type": "TEXT"
+          },
+          {
+            "name": "cronologia_macrofase",
+            "path": "$._theDocument.cronologiaMacrofase",
+            "type": "TEXT",
+            "apply_regex": {
+              "type": "replaceAll",
+              "regex": "(\\s)?\\([\\s\\S]*",
+              "replacement": ""
+            }
+          },
+          {
+            "name": "specifiche_cronologia",
+            "path": "$._theDocument.specificheCronologia",
+            "type": "TEXT"
+          },
+          {
+            "name": "quota_max",
+            "path": "$._theDocument.quotaMax",
+            "type": "TEXT"
+          },
+          {
+            "name": "quota_min",
+            "path": "$._theDocument.quotaMin",
+            "type": "TEXT"
           }
         ],
         "jslt": {},
@@ -271,323 +344,310 @@
         ]
       }
     },
-     {
-            "_id": "org.gcube.portlets.user.geoportal-data-entry-app",
-            "_type": "DATA_ENTRY_GUI",
-            "_configuration": {
-                "gcubeProfiles": [
-                    {
-                        "gcubeSecondaryType": "GeoNaMetadata",
-                        "gcubeName": "Informazioni_di_progetto",
-                        "sectionName": "$.",
-                        "sectionTitle": "Informazioni di Progetto"
-                    },
-                    {
-                        "gcubeSecondaryType": "GeoNaMetadata",
-                        "gcubeName": "Abstract_Relazione_di_Scavo",
-                        "sectionName": "abstractRelazione",
-                        "sectionTitle": "Abstract della Relazione Scientifica",
-                        "parentName": "$.",
-                        "filePaths": [
-                            {
-                                "gcubeProfileFieldName": "Carica Abstract Ita (in PDF)",
-                                "fieldDefinition": "$.abstractRelazione._children[?(@.filesetIta)]",
-                                "fieldName": "filesetIta"
-                            },
-                            {
-                                "gcubeProfileFieldName": "Carica Abstract Eng (in PDF)",
-                                "fieldDefinition": "$.abstractRelazione._children[?(@.filesetEng)]",
-                                "fieldName": "filesetEng"
-                            }
-                        ]
-                    },
-                    {
-                        "gcubeSecondaryType": "GeoNaMetadata",
-                        "gcubeName": "Relazione_di_Scavo",
-                        "sectionName": "relazioneScavo",
-                        "sectionTitle": "Relazione Scientifica",
-                        "parentName": "$.",
-                        "filePaths": [
-                            {
-                                "gcubeProfileFieldName": "Relazione scientifica (in PDF)",
-                                "fieldDefinition": "$.relazioneScavo._children[?(@.fileset)]",
-                                "fieldName": "fileset"
-                            }
-                        ]
-                    },
-                    {
-                        "gcubeSecondaryType": "GeoNaMetadata",
-                        "gcubeName": "Immagine_Rappresentativa_di_Scavo",
-                        "sectionName": "immaginiRappresentative",
-                        "sectionTitle": "Immagini Rappresentative",
-                        "minOccurs": 1,
-                        "maxOccurs": 4,
-                        "parentName": "$.",
-                        "filePaths": [
-                            {
-                                "gcubeProfileFieldName": "Immagine",
-                                "fieldDefinition": "$.immaginiRappresentative._children[?(@.fileset)]",
-                                "fieldName": "fileset"
-                            }
-                        ]
-                    },
-                    {
-                        "gcubeSecondaryType": "GeoNaMetadata",
-                        "gcubeName": "Posizionamento_dell_area_di_indagine",
-                        "sectionName": "posizionamentoScavo",
-                        "sectionTitle": "Posizionamento dell'Area di Indagine",
-                        "parentName": "$.",
-                        "filePaths": [
-                            {
-                                "gcubeProfileFieldName": "File",
-                                "fieldDefinition": "$.posizionamentoScavo._children[?(@.fileset)]",
-                                "fieldName": "fileset"
-                            }
-                        ]
-                    },
-                    {
-                        "gcubeSecondaryType": "GeoNaMetadata",
-                        "gcubeName": "Pianta_di_fine_Scavo",
-                        "sectionName": "pianteFineScavo",
-                        "sectionTitle": "Piante di Fine Indagine",
-                        "parentName": "$.",
-                        "minOccurs": 0,
-                        "maxOccurs": 0,
-                        "filePaths": [
-                            {
-                                "gcubeProfileFieldName": "File",
-                                "fieldDefinition": "$.pianteFineScavo._children[?(@.fileset)]",
-                                "fieldName": "fileset"
-                            }
-                        ]
-                    }
-                ],
-                "saveStep": ""
-            }
-        },
     {
-  "_id": "org.gcube.portlets.user.geoportal-data-list",
-  "_type": "DATA_LIST_GUI",
-  "_configuration": {
-    "itemFields": [
-      {
-        "label": "Any Field",
-        "paths": [
-          "_theDocument.nome",
-          "_theDocument.introduzione",
-          "_theDocument.authors",
-          "_theDocument.contributore",
-          "_theDocument.titolari",
-          "_theDocument.editore",
-          "_theDocument.responsabile",
-          "_theDocument.paroleChiaveLibere",
-          "_theDocument.paroleChiaveICCD"
+      "_id": "org.gcube.portlets.user.geoportal-data-entry-app",
+      "_type": "DATA_ENTRY_GUI",
+      "_configuration": {
+        "gcubeProfiles": [
+          {
+            "gcubeSecondaryType": "GeoNaMetadata",
+            "gcubeName": "Informazioni_di_progetto_estero",
+            "sectionName": "$.",
+            "sectionTitle": "Informazioni di Progetto per l'Estero"
+          },
+          {
+            "gcubeSecondaryType": "GeoNaMetadata",
+            "gcubeName": "Abstract_Relazione_di_Scavo",
+            "sectionName": "abstractRelazione",
+            "sectionTitle": "Abstract della Relazione Scientifica",
+            "parentName": "$.",
+            "filePaths": [
+              {
+                "gcubeProfileFieldName": "Carica Abstract Ita (in PDF)",
+                "fieldDefinition": "$.abstractRelazione._children[?(@.filesetIta)]",
+                "fieldName": "filesetIta"
+              },
+              {
+                "gcubeProfileFieldName": "Carica Abstract Eng (in PDF)",
+                "fieldDefinition": "$.abstractRelazione._children[?(@.filesetEng)]",
+                "fieldName": "filesetEng"
+              }
+            ]
+          },
+          {
+            "gcubeSecondaryType": "GeoNaMetadata",
+            "gcubeName": "Relazione_di_Scavo",
+            "sectionName": "relazioneScavo",
+            "sectionTitle": "Relazione Scientifica",
+            "parentName": "$.",
+            "filePaths": [
+              {
+                "gcubeProfileFieldName": "Relazione scientifica (in PDF)",
+                "fieldDefinition": "$.relazioneScavo._children[?(@.fileset)]",
+                "fieldName": "fileset"
+              }
+            ]
+          },
+          {
+            "gcubeSecondaryType": "GeoNaMetadata",
+            "gcubeName": "Immagine_Rappresentativa_di_Scavo",
+            "sectionName": "immaginiRappresentative",
+            "sectionTitle": "Immagini Rappresentative",
+            "minOccurs": 1,
+            "maxOccurs": 4,
+            "parentName": "$.",
+            "filePaths": [
+              {
+                "gcubeProfileFieldName": "Immagine",
+                "fieldDefinition": "$.immaginiRappresentative._children[?(@.fileset)]",
+                "fieldName": "fileset"
+              }
+            ]
+          },
+          {
+            "gcubeSecondaryType": "GeoNaMetadata",
+            "gcubeName": "Posizionamento_dell_area_di_indagine",
+            "sectionName": "posizionamentoScavo",
+            "sectionTitle": "Posizionamento dell'Area di Indagine",
+            "parentName": "$.",
+            "filePaths": [
+              {
+                "gcubeProfileFieldName": "File",
+                "fieldDefinition": "$.posizionamentoScavo._children[?(@.fileset)]",
+                "fieldName": "fileset"
+              }
+            ]
+          },
+          {
+            "gcubeSecondaryType": "GeoNaMetadata",
+            "gcubeName": "Pianta_di_fine_Scavo",
+            "sectionName": "pianteFineScavo",
+            "sectionTitle": "Piante di Fine Indagine",
+            "parentName": "$.",
+            "minOccurs": 0,
+            "maxOccurs": 0,
+            "filePaths": [
+              {
+                "gcubeProfileFieldName": "File",
+                "fieldDefinition": "$.pianteFineScavo._children[?(@.fileset)]",
+                "fieldName": "fileset"
+              }
+            ]
+          }
         ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": false,
-        "asResult": false
-      },
-      {
-        "label": "Name",
-        "paths": [
-          "_theDocument.nome"
-        ],
-        "operator": "$and",
-        "searchable": true,
-        "sortable": true,
-        "asResult": true
-      },
-      {
-        "label": "Introduction",
-        "paths": [
-          "_theDocument.introduzione"
-        ],
-        "operator": "$and",
-        "searchable": true,
-        "sortable": false,
-        "asResult": true
-      },
-      {
-        "label": "Author/s",
-        "paths": [
-          "_theDocument.authors"
-        ],
-        "operator": "$and",
-        "searchable": false,
-        "sortable": true,
-        "asResult": true
-      },
-      {
-        "label": "Project Start (yyyy-mm-dd)",
-        "paths": [
-          "_theDocument.dataInizioProgetto"
-        ],
-        "operator": "$and",
-        "searchable": true,
-        "sortable": true,
-        "asResult": true
-      },
-      {
-        "label": "Director/Staff",
-        "paths": [
-          "_theDocument.authors",
-          "_theDocument.contributore",
-          "_theDocument.titolari",
-          "_theDocument.editore",
-          "_theDocument.responsabile"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": false,
-        "asResult": true
-      },
-      {
-        "label": "Keywords",
-        "paths": [
-          "_theDocument.paroleChiaveLibere",
-          "_theDocument.paroleChiaveICCD"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": false,
-        "asResult": true
-      },
-      {
-        "label": "Creator",
-        "paths": [
-          "_info._creationInfo._user._username"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": false,
-        "asResult": false
-      },
-      {
-        "label": "Updated",
-        "paths": [
-          "_info._lastEditInfo._instant"
-        ],
-        "operator": "$or",
-        "searchable": false,
-        "sortable": true,
-        "asResult": false
-      },
-      {
-        "label": "Phase",
-        "paths": [
-          "_lifecycleInformation._phase"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": true,
-        "asResult": false
-      },
-      {
-        "label": "Status",
-        "paths": [
-          "_lifecycleInformation._lastOperationStatus"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": true,
-        "asResult": false
+        "saveStep": ""
       }
-    ]
-  }
-},
+    },
     {
-  "_id": "org.gcube.portlets.user.geoportal-basic-data-list",
-  "_type": "BASIC_DATA_LIST_GUI",
-  "_configuration": {
-    "itemFields": [
-      {
-        "label": "Any Field",
-        "paths": [
-          "_theDocument.nome",
-          "_theDocument.introduzione",
-          "_theDocument.authors",
-          "_theDocument.contributore",
-          "_theDocument.titolari",
-          "_theDocument.editore",
-          "_theDocument.responsabile",
-          "_theDocument.paroleChiaveLibere",
-          "_theDocument.paroleChiaveICCD"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": false,
-        "asResult": false
-      },
-      {
-        "label": "Name",
-        "paths": [
-          "_theDocument.nome"
-        ],
-        "operator": "$and",
-        "searchable": true,
-        "sortable": true,
-        "asResult": true
-      },
-      {
-        "label": "Introduction",
-        "paths": [
-          "_theDocument.introduzione"
-        ],
-        "operator": "$and",
-        "searchable": true,
-        "sortable": false,
-        "asResult": true
-      },
-      {
-        "label": "Project Start",
-        "paths": [
-          "_theDocument.dataInizioProgetto"
-        ],
-        "operator": "$and",
-        "searchable": false,
-        "sortable": false,
-        "asResult": true
-      },
-      {
-        "label": "Project Start (YEAR)",
-        "paths": [
-          "_theDocument.dataInizioProgetto"
-        ],
-        "operator": "$and",
-        "searchable": true,
-        "sortable": false,
-        "asResult": false
-      },
-      {
-        "label": "Director/Staff",
-        "paths": [
-          "_theDocument.authors",
-          "_theDocument.contributore",
-          "_theDocument.titolari",
-          "_theDocument.editore",
-          "_theDocument.responsabile"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": false,
-        "asResult": true
-      },
-      {
-        "label": "Keywords",
-        "paths": [
-          "_theDocument.paroleChiaveLibere",
-          "_theDocument.paroleChiaveICCD"
-        ],
-        "operator": "$or",
-        "searchable": true,
-        "sortable": false,
-        "asResult": true
+      "_id": "org.gcube.portlets.user.geoportal-data-list",
+      "_type": "DATA_LIST_GUI",
+      "_configuration": {
+        "itemFields": [
+          {
+            "label": "Any Field",
+            "paths": [
+              "_theDocument.nome",
+              "_theDocument.introduzione",
+              "_theDocument.contributore",
+              "_theDocument.editore",
+              "_theDocument.responsabile",
+              "_theDocument.paroleChiaveLibere",
+              "_theDocument.cronologiaMacrofase",
+              "_theDocument.contestoIndagine",
+              "_theDocument.paroleChiaveICCD"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": false,
+            "asResult": false
+          },
+          {
+            "label": "Name",
+            "paths": [
+              "_theDocument.nome"
+            ],
+            "operator": "$and",
+            "searchable": true,
+            "sortable": true,
+            "asResult": true
+          },
+          {
+            "label": "Introduction",
+            "paths": [
+              "_theDocument.introduzione"
+            ],
+            "operator": "$and",
+            "searchable": true,
+            "sortable": false,
+            "asResult": true
+          },
+          {
+            "label": "Project Start (yyyy-mm-dd)",
+            "paths": [
+              "_theDocument.dataInizioProgetto"
+            ],
+            "operator": "$and",
+            "searchable": true,
+            "sortable": true,
+            "asResult": true
+          },
+          {
+            "label": "Director/Staff",
+            "paths": [
+              "_theDocument.contributore",
+              "_theDocument.responsabile",
+              "_theDocument.editore"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": false,
+            "asResult": true
+          },
+          {
+            "label": "Keywords",
+            "paths": [
+              "_theDocument.paroleChiaveLibere",
+              "_theDocument.cronologiaMacrofase",
+              "_theDocument.paroleChiaveICCD"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": false,
+            "asResult": true
+          },
+          {
+            "label": "Creator",
+            "paths": [
+              "_info._creationInfo._user._username"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": false,
+            "asResult": false
+          },
+          {
+            "label": "Updated",
+            "paths": [
+              "_info._lastEditInfo._instant"
+            ],
+            "operator": "$or",
+            "searchable": false,
+            "sortable": true,
+            "asResult": false
+          },
+          {
+            "label": "Phase",
+            "paths": [
+              "_lifecycleInformation._phase"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": true,
+            "asResult": false
+          },
+          {
+            "label": "Status",
+            "paths": [
+              "_lifecycleInformation._lastOperationStatus"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": true,
+            "asResult": false
+          }
+        ]
       }
-    ]
-  }
-}
-,
+    },
+    {
+      "_id": "org.gcube.portlets.user.geoportal-basic-data-list",
+      "_type": "BASIC_DATA_LIST_GUI",
+      "_configuration": {
+        "itemFields": [
+          {
+            "label": "Any Field",
+            "paths": [
+              "_theDocument.nome",
+              "_theDocument.introduzione",
+              "_theDocument.contributore",
+              "_theDocument.editore",
+              "_theDocument.responsabile",
+              "_theDocument.paroleChiaveLibere",
+              "_theDocument.cronologiaMacrofase",
+              "_theDocument.contestoIndagine",
+              "_theDocument.paroleChiaveICCD"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": false,
+            "asResult": false
+          },
+          {
+            "label": "Name",
+            "paths": [
+              "_theDocument.nome"
+            ],
+            "operator": "$and",
+            "searchable": true,
+            "sortable": true,
+            "asResult": true
+          },
+          {
+            "label": "Introduction",
+            "paths": [
+              "_theDocument.introduzione"
+            ],
+            "operator": "$and",
+            "searchable": true,
+            "sortable": false,
+            "asResult": true
+          },
+          {
+            "label": "Project Start",
+            "paths": [
+              "_theDocument.dataInizioProgetto"
+            ],
+            "operator": "$and",
+            "searchable": false,
+            "sortable": false,
+            "asResult": true
+          },
+          {
+            "label": "Project Start (YEAR)",
+            "paths": [
+              "_theDocument.dataInizioProgetto"
+            ],
+            "operator": "$and",
+            "searchable": true,
+            "sortable": false,
+            "asResult": false
+          },
+          {
+            "label": "Director/Staff",
+            "paths": [
+              "_theDocument.contributore",
+              "_theDocument.responsabile",
+              "_theDocument.editore"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": false,
+            "asResult": true
+          },
+          {
+            "label": "Keywords",
+            "paths": [
+              "_theDocument.paroleChiaveLibere",
+              "_theDocument.cronologiaMacrofase",
+              "_theDocument.paroleChiaveICCD"
+            ],
+            "operator": "$or",
+            "searchable": true,
+            "sortable": false,
+            "asResult": true
+          }
+        ]
+      }
+    },
     {
       "_id": "org.gcube.portlets.user.geoportal-timeline-json-template",
       "_type": "TIMELINE_JSON_TEMPLATE",
@@ -660,10 +720,16 @@
       }
     }
   ],
-  "_relationshipDefinitions" : [
-    {"_id": "precedes", "_label" : "Precede",
-      "_reverseRelationId" : "follows"},
-    {"_id": "follows", "_label" : "Segue",
-      "_reverseRelationId" : "precedes"}
+  "_relationshipDefinitions": [
+    {
+      "_id": "precedes",
+      "_label": "Precede",
+      "_reverseRelationId": "follows"
+    },
+    {
+      "_id": "follows",
+      "_label": "Segue",
+      "_reverseRelationId": "precedes"
+    }
   ]
-}
+}
\ No newline at end of file