Refactoring so that deltas and InstanceIdentifiers are ChangeNotification types