Refactor catch all requests