Updates to request handler