Interface refactoring