Revert static methods to instance methods per discussion