Replace class methods to instance methods