Resolve circular dependencies