More changes for bulk operations