Dependencies refactor