End point and JSON parsing updated