- UniqueIdGenerator refactoring