UniqueId refactoring