Change from module to class