UUID refactoring