Debug refactoring changes