Moved static methods to instance methods to make way for use of ZAP
impls.