Improved the request class