Change from deprecated onRequest to Message