diff --git a/ContextSaver.py b/ContextSaver.py
index 24b3e497f5569675c66433a75abc628b31e0c4ed..09efdbc9e95c8103827c5d265a96d0941f94d369 100644
--- a/ContextSaver.py
+++ b/ContextSaver.py
@@ -152,7 +152,7 @@ if __name__ == "__main__":
 
     #######################################################
     # Prepare array for result
-    results = []
+    results = dict()
 
     #######################################################
     # Scan all devices
@@ -171,13 +171,12 @@ if __name__ == "__main__":
 
         # Build json dict
         jdict = {
-                "tangopath":dev,
                 "wattributes":wattr,
                 "properties":props,
                 }
 
         # Add to results
-        results.append(jdict)
+        results[dev] = jdict
 
     logger.info("Done")