Updated with correct headers & structure of returned data