Restructured for new IdentityModel