Fix missing Identity field in GetIdentity.

Also moves adding the Identity field into the field-adding function.