Use batches to reflect Captricity2.0 update