Switch to class methods