Interfaces refactoring