Adding the dagre module
Updating the data structures.
Minor updates