Significant refactoring of interfaces.