Resolve dependency cycle