Changed instance methods to class methods