CFY-768 use new plan structure and seperate node/relationships from node_instances/relationship_instances