Circular dependency to dependency_tracker fixed