Continue refactoring - BC break (all static methods gone from interfaces)