Change instance methods to class methods