Handle UUIDs.
UUID conversion
Fix merge