BUG-2399: take into account new ModificationTypes