Some improvements to the request