Working on object graph creation
Fixed merge conflict