Some changes to RequestHandler