make batch work
Only set json if we have raw
Add afterBatchSave callback