Refactoring: new dependencies