Moving Dependency Tracking Into The CM Process