Changed JSON structure to remove type and add ID