Fix bug when conditions is an iterator in findWith
Change order for dependencies
Change import order