; and (B) by inserting after paragraph (3), the following: (4) Quality reporting for medicaid eligible adults Beginning not later than January 1 of the calendar year that begins on or after the date that is 2 years after the date of enactment of the Medicaid and CHIP Quality Improvement Act of 2017 , and annually thereafter, the Secretary shall require States to use the measures and approaches identified in paragraph (3) to report on the initial core set of quality measures for Medicaid eligible adults identified in paragraph (2), subject to revisions made in accordance with paragraph (6)(B). Such reporting shall be stratified by delivery system, including managed care organizations under section 1932, benchmark plans under section 1937, primary care case management services providers described in section 1905(t), health care services in fee-for-service settings, and other delivery systems, except that the Secretary may determine that reporting on certain measures should not be stratified by delivery system because such stratification would not be feasible or the delivery systems are not comparable with respect to the application of such measures. In addition to the stratification required under the previous sentence, the Secretary shall have the discretion to further stratify reporting on certain measures based on factors such as eligibility category, income level, or other differentiating factors that could have an impact on the comparability of the measure. ; and (2) in subsection (d)— (A) in paragraph (1)(A), by striking under the such plan and all that follows through subsection (a)(5) and inserting under such plan or waiver, including measures described in subsection (b)(2), subject to revisions made in accordance with subsection (b)(6)(B) ; (B) in paragraph (1)(B), by inserting , or comparable primary care case management services providers described in section 1905(t), as well as health care services furnished in fee-for-service settings or other delivery systems after section 1937