Interface refactorization