Update for UUIDS