; (2) better enable assessment of the impact of the National HIV/AIDS Strategy and the Patient Protection and Affordable Care Act ( Public Law 111–148 ) on improving HIV/AIDS care and access to supportive services for individuals with HIV; (3) expand the demographic data elements to be captured by Federal data systems relevant to HIV care to permit calculation of the indicators for subgroups of the population of people with diagnosed HIV infection, including— (A) age; (B) race; (C) ethnicity; (D) sex (assigned at birth); (E) gender identity; (F) sexual orientation; (G) current geographic marker of residence; (H) income or poverty level; and (I) primary means of reimbursement for medical services (including a State Medicaid program, the Medicare program, the Ryan White HIV/AIDS Program, private insurance, health maintenance organizations, and no coverage)