diff --git a/src/main/java/org/gcube/resourcemanagement/rest/ContextManager.java b/src/main/java/org/gcube/resourcemanagement/rest/ContextManager.java
index b0d6e6e..76c3ab0 100644
--- a/src/main/java/org/gcube/resourcemanagement/rest/ContextManager.java
+++ b/src/main/java/org/gcube/resourcemanagement/rest/ContextManager.java
@@ -48,9 +48,9 @@ public class ContextManager extends BaseREST {
 	public String create(String json)
 			throws ResourceRegistryException {
 		logger.info("Requested to update/create {} with json {} ", Context.NAME, json);
-//		setAccountingMethod(Method.UPDATE, Context.NAME);
+		setAccountingMethod("Create Context");
 		
-		return "";
+		return "{}";
 	}
 	
 	/*
@@ -70,9 +70,9 @@ public class ContextManager extends BaseREST {
 			// TODO get from IS
 		}
 		logger.info("Requested to read {} with id {} ", Context.NAME, uuid);
-//		setAccountingMethod(Method.READ, Context.NAME);
+		setAccountingMethod("Read Context");
 		
-		return "";
+		return "{}";
 	}
 	
 	/*
@@ -91,9 +91,9 @@ public class ContextManager extends BaseREST {
 	public String update(@PathParam(ContextManager.CONTEXT_UUID_PATH_PARAMETER) String uuid, String json)
 			throws ResourceRegistryException {
 		logger.info("Requested to update/create {} with json {} ", Context.NAME, json);
-//		setAccountingMethod(Method.UPDATE, Context.NAME);
+		setAccountingMethod("Update Context");
 		
-		return "";
+		return "{}";
 	}
 	
 	/*
@@ -106,7 +106,7 @@ public class ContextManager extends BaseREST {
 	public Response delete(@PathParam(ContextManager.CONTEXT_UUID_PATH_PARAMETER) String uuid)
 			throws ContextNotFoundException, ResourceRegistryException {
 		logger.info("Requested to delete {} with id {} ", Context.NAME, uuid);
-		setAccountingMethod("deleteContext");
+		setAccountingMethod("Delete Context");
 		
 		return Response.status(Status.NO_CONTENT).build();
 	}