Changed class to module