Corrected Graph data building