Updated from module to a class