Resolve circular dependency