refactoring for UUID