Interfaces refactored