Introduce unique identifiers as a wrapper.
Refactoring.