add legacy MPBatch handling
MPBatch update and cleanup