Removed the need to pass the Request object