More uuid refactorings