Changed module to class