Added User.clientId
Added Payment.externalIds