Batch Entities feature - MacOS changes.