Added graph, manually corrected foreign keys