Changed class to a module