Moved class methods to instance methods.