Moving argument from module to class