Refactoring with new code dependencies