diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java
index 551e70f..5ea2117 100644
--- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java
+++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java
@@ -41,7 +41,7 @@ import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public abstract class AbstractLifeCycleManager extends AbstractPlugin implements LifecycleManager {
-
+	
     protected static class Events{
         public static final OperationDescriptor INIT=new OperationDescriptor(EventExecutionRequest.Events.ON_INIT_DOCUMENT,"Sets defaults and validate");
         public static final OperationDescriptor UPDATE=new OperationDescriptor(EventExecutionRequest.Events.ON_UPDATE_DOCUMENT,"Sets defaults and validate");
diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java
index c99e911..34ae9a5 100644
--- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java
+++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java
@@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class Default3PhaseManager extends SimpleLifeCycleManager implements LifecycleManager {
 
-    protected static class Phases {
+	protected static class Phases {
         public static final String PENDING_APPROVAL="Pending Approval";
         public static final String PUBLISHED=SimpleLifeCycleManager.Phases.PUBLISHED;
 
@@ -171,9 +171,10 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life
     protected Document getInternalIndexParams(BaseRequest req){
         Document callParameters = new Document();
 
-        callParameters.put("workspace", Files.fixFilename(req.getUseCaseDescriptor().getId()+"_internal_"+req.getContext().getName()));
-        callParameters.put("indexName",Files.fixFilename(req.getUseCaseDescriptor().getId()+"_internal_"+req.getContext().getName()+"_centroids"));
-        callParameters.put("flagInternalIndex", Boolean.TRUE);
+        callParameters.put(IndexConstants.INDEX_PARAMETER_WORKSPACE, Files.fixFilename(req.getUseCaseDescriptor().getId()+"_internal_"+req.getContext().getName()));
+        callParameters.put(IndexConstants.INDEX_PARAMETER_INDEXNAME,Files.fixFilename(req.getUseCaseDescriptor().getId()+"_internal_"+req.getContext().getName()+"_centroids"));
+        //Added by Francesco
+        callParameters.put(IndexConstants.INDEX_PARAMETER_FLAGINTERNALINDEX, Boolean.TRUE);
         return callParameters;
     }
 
@@ -211,8 +212,7 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life
 		log.info(STEPS.REJECT + " running...");
 
 		// DeMaterialize
-		JSONPathWrapper wrapper = new JSONPathWrapper(
-				theReport.getTheRequest().getDocument().getTheDocument().toJson());
+		JSONPathWrapper wrapper = new JSONPathWrapper(theReport.getTheRequest().getDocument().getTheDocument().toJson());
 		for (String s : wrapper.getMatchingPaths("$..[?(@." + RegisteredFileSet.PAYLOADS + ")]")) {
 			log.info("Requesting dematerialization for {} ", s);
 			for (MaterializationPlugin mat : getMaterializers(theReport.getTheRequest()))
diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java
index 8e49858..de1833f 100644
--- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java
+++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java
@@ -93,9 +93,9 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements
 
     protected Document getPublicIndexParams(BaseRequest req){
         Document callParameters = new Document();
-        callParameters.put("workspace",Files.fixFilename(req.getUseCaseDescriptor().getId()+req.getContext().getName()));
-        callParameters.put("indexName",Files.fixFilename(req.getUseCaseDescriptor().getId()+req.getContext().getName()+"_centroids"));
-        callParameters.put("flagInternalIndex", Boolean.FALSE);
+        callParameters.put(IndexConstants.INDEX_PARAMETER_WORKSPACE,Files.fixFilename(req.getUseCaseDescriptor().getId()+req.getContext().getName()));
+        callParameters.put(IndexConstants.INDEX_PARAMETER_INDEXNAME,Files.fixFilename(req.getUseCaseDescriptor().getId()+req.getContext().getName()+"_centroids"));
+        callParameters.put(IndexConstants.INDEX_PARAMETER_FLAGINTERNALINDEX, Boolean.FALSE);
         return callParameters;
     }