Refactored
Tracking dependency resolution