Changed unique identifier to be always an integer