Made changes to include Graph Id in the JSON