Resolve circular dependence