Refactoring interface