update imports to the moved BatchContext