Move static methods to instance methods