Update for UUIDs