Update the handling of uuid.