Dependencies refactoring