Switch to static method from instance method