Changed how the Requests is handled. Changed the API to match the backend