Dependencies refactored