Move all long operations into the Batch API
Add support for property merging