Turned the module into a Handler
Made the Handler Async