Improved and extended batch API