Added primaryIdentifierName/Value function