Replaced instance methods with class