Interfaces refactoring.