Fixed compiler warning of deprectated uniqueIdentifier