Changed JSON structure as per Swagger