Refactor new request handling.