Refactoring top interfaces