Task dependencies refactored