diff --git a/src/org/gcube/vremanagement/vremodeler/consumers/FunctionalityConsumer.java b/src/org/gcube/vremanagement/vremodeler/consumers/FunctionalityConsumer.java
index 2754736..d69fbe6 100644
--- a/src/org/gcube/vremanagement/vremodeler/consumers/FunctionalityConsumer.java
+++ b/src/org/gcube/vremanagement/vremodeler/consumers/FunctionalityConsumer.java
@@ -34,26 +34,26 @@ private GCUBELog logger= new GCUBELog(GHNConsumer.class);
 	
 	public void onNotificationReceived(NotificationEvent event){
 		try{
-			logger.trace("notificetion received");
 			ServiceContext.getContext().setScope(this.scope);
 			String id= event.getPayload().getMessage()[0].getChildNodes().item(0).getChildNodes().item(0).getNodeValue();
 			String operation=event.getPayload().getMessage()[0].getChildNodes().item(1).getChildNodes().item(0).getNodeValue();
-			if (id.compareTo(this.resourceId)==0 && operation.compareTo("modify")==0){
+			logger.info("notification received for genericResource "+id+" and operation "+operation);
+			if (id.compareTo(this.resourceId)==0 && (operation.compareTo("update")==0 || operation.compareTo("create")==0)){
+				logger.trace("notification received for functionalityResource with id "+id+" in scope "+scope.toString());
 				KGCUBEGenericFunctionalityResource resource= new KGCUBEGenericFunctionalityResource();
 				ISClient client=GHNContext.getImplementation(ISClient.class);
 				GCUBEGenericResourceQuery query= client.getQuery(GCUBEGenericResourceQuery.class);
 				query.addAtomicConditions(new AtomicCondition("/Profile/Name","FuctionalitiesResource"), new AtomicCondition("/Profile/SecondaryType","VREModelerResource"));
 				GCUBEGenericQuery genericQuery= client.getQuery(GCUBEGenericQuery.class);
 				genericQuery.setExpression(query.getExpression());
+				Thread.sleep(60000);
 				resource.load(new StringReader(client.execute(genericQuery, ServiceContext.getContext().getScope()).get(0).toString()));
-			 	Thread.sleep(60000);
-				//FunctionalityHandler
+			 	//FunctionalityHandler
 			 	FunctionalityHandler functionalityHandler= new FunctionalityHandler();
 			 	functionalityHandler.add(resource);
-			 	
 			}
 
-		}catch(Exception e){logger.error("error in notification received",e);}
+		}catch(Exception e){logger.error("error in functionality notification",e);}
 	}
 	
 }
diff --git a/src/org/gcube/vremanagement/vremodeler/consumers/MCollectionConsumer.java b/src/org/gcube/vremanagement/vremodeler/consumers/MCollectionConsumer.java
index 2af285f..06999fc 100644
--- a/src/org/gcube/vremanagement/vremodeler/consumers/MCollectionConsumer.java
+++ b/src/org/gcube/vremanagement/vremodeler/consumers/MCollectionConsumer.java
@@ -29,7 +29,7 @@ public class MCollectionConsumer extends BaseNotificationConsumer{
 	
 	public void onNotificationReceived(NotificationEvent event){
 		try{
-			logger.trace("notificetion received");
+			//logger.trace("notification received");
 			ServiceContext.getContext().setScope(this.scope);
 			String id= event.getPayload().getMessage()[0].getChildNodes().item(0).getChildNodes().item(0).getNodeValue();
 			String operation=event.getPayload().getMessage()[0].getChildNodes().item(1).getChildNodes().item(0).getNodeValue();
diff --git a/src/org/gcube/vremanagement/vremodeler/consumers/RunningInstanceConsumer.java b/src/org/gcube/vremanagement/vremodeler/consumers/RunningInstanceConsumer.java
index 525cab0..23c6c61 100644
--- a/src/org/gcube/vremanagement/vremodeler/consumers/RunningInstanceConsumer.java
+++ b/src/org/gcube/vremanagement/vremodeler/consumers/RunningInstanceConsumer.java
@@ -29,7 +29,7 @@ public class RunningInstanceConsumer extends BaseNotificationConsumer{
 	
 	public void onNotificationReceived(NotificationEvent event){
 		try{
-			logger.trace("notificetion received");
+			logger.trace("notification received for RI");
 			ServiceContext.getContext().setScope(this.scope);
 			String id= event.getPayload().getMessage()[0].getChildNodes().item(0).getChildNodes().item(0).getNodeValue();
 			String operation=event.getPayload().getMessage()[0].getChildNodes().item(1).getChildNodes().item(0).getNodeValue();
diff --git a/src/org/gcube/vremanagement/vremodeler/resources/handlers/FunctionalityHandler.java b/src/org/gcube/vremanagement/vremodeler/resources/handlers/FunctionalityHandler.java
index c0254a2..d9228b5 100644
--- a/src/org/gcube/vremanagement/vremodeler/resources/handlers/FunctionalityHandler.java
+++ b/src/org/gcube/vremanagement/vremodeler/resources/handlers/FunctionalityHandler.java
@@ -45,9 +45,10 @@ public class FunctionalityHandler implements ResourceHandler<KGCUBEGenericFuncti
 	
 	public void add(KGCUBEGenericFunctionalityResource resource)
 			throws Exception {
-		DBInterface.deleteAll(functionalityTableName);
-		DBInterface.deleteAll(portletTableName);
 		DBInterface.deleteAll(serviceTableName);
+		DBInterface.deleteAll(portletTableName);
+		DBInterface.deleteAll(functionalityTableName);
+		logger.debug("functionality clean");
 		this.insert(resource);
 		logger.debug("functionality changed");
 	}
@@ -65,6 +66,7 @@ public class FunctionalityHandler implements ResourceHandler<KGCUBEGenericFuncti
 			genericQuery.setExpression(query.getExpression());
 			resource.load(new StringReader(queryClient.execute(genericQuery, ServiceContext.getContext().getScope()).get(0).toString()));
 			this.functionalityResourceId= resource.getID();
+			logger.debug("the functionality resource ID is "+this.functionalityResourceId);
 			this.insert(resource);
 			logger.debug("functionality initialized");
 		}catch(Exception e ){logger.error("Functionality resource not found",e); logger.warn("the service will be initialized without functionalities"); }