Converted the module into a class