Update uuid creation