Updated Graph output format