Update to using request handler