Update to new onRequest interface