Updated the request object so it's more testable and to provide more information