diff --git a/src/adapter.py b/src/adapter.py
index d70678e..d46e305 100644
--- a/src/adapter.py
+++ b/src/adapter.py
@@ -34,33 +34,32 @@ def to_json(self, **table_kwargs):
             In this Creator service, it converts data from the Database to the initial JSON schema following the TNM.
         """
         dataModel = DataModel
-        nodesJSON = table_kwargs["nodes"]
-        dataModel.errorList = table_kwargs["errors"]
-        dataModel.metadata = table_kwargs["metadata"]
-        dataModel.vehicle = table_kwargs["vehicle"]
 
         #Add nodes to dataModel
         for row in table_kwargs["nodes"]:
             node=makeNode(row)
-            dataModel.nodes.insert(node.node_id, node)#add node at its node_id
+            dataModel["nodes"].insert(node["node_id"], node)#add node at its node_id
+
+        print(dataModel)
         
         #Add edges to nodes in dataModel
+        """
         for row in table_kwargs["edges"]:
             edge = makeEdge(row)
             from_node_id = row["edge_basenode"]
             dataModel.nodes[from_node_id].edges.insert(edge.edge_id,edge)#the from_node_id is used to position an edge at its origining node, and the edge, using this alternative can remove edge.from_node_id from makeEdge
-           
+        """
+
         serialized_data = json.dumps(dataModel)
         return serialized_data
-                  
         
 
 def makeNode(row):
     node ={} 
-    node.node_id = row["node_id"]
-    node.node_weight = row["node_weight"]
-    node.edges = [] 
-    node.data = {
+    node["node_id"] = row["node_id"]
+    node["node_weight"] = 1 # Check RFC for correct initialized value
+    node["edges"] = [] 
+    node["data"] = {
         "longitude" : row["lon"],
         "latitude" : row["lat"]
     }