SCHEMA-189. Goes in a new direction for batching.