Handle duplicate UUIDs