SDK Updates (Removing use of uniqueIdentifier)