Reverted static methods to instance methods.