Add support for batchSize and defaultValues