Start migrating to new CargoResult