Simplify including functionality from module to class