Rest of UUID update
May need some more tweaks