More interface and extension method refactoring