Revert to extending the request class again