Updated Graph Parsing and creation