Patch 5-updated

Was #699, updated base to post-UUID converter.