This Viewpoint discusses concern that current risk adjustment models used by CMS to tie payment to performance do not account for dementia, frailty, and social risk, and proposes ways to add reliable measures of each to the agency’s CMS-HCC model to more equitably reimburse clinicians and facilities caring for patients with challenging conditions.