better uuid handling