Fixed endpoint and updated unmarshalling