Update to allow batching