Refactorization of interfaces in progress...