Update to new IdentityModel