plexus Improve UUID handling