Refactoring; interface is now static.