; (2) behavioral health services for the treatment of opioid use disorders, including treatment of opioid use disorders in non-hospital residential facilities licensed to provide such treatment; or (3) community recovery support services that are provided in conjunction with, where appropriate, medication-assisted treatment for an opioid use disorder, such as peer counseling and transportation, to support the enrollee in maintaining a healthy lifestyle following opioid misuse treatment. . (b) Effective date The amendment made by subsection (a) shall apply with respect to plan years beginning on or after January 1, 2025. 4. Enhanced Federal match for medication-assisted treatment and recovery support services under Medicaid (a) In general Section 1905(b) of the Social Security Act ( 42 U.S.C. 1396d(b) ) is amended by adding at the end the following: Notwithstanding the first sentence of this subsection, during the portion of the period described in subsection (a)(29) that begins on the date of enactment of this sentence, the Federal medical assistance percentage shall be 90 percent with respect to amounts expended during such portion of such period by a State that is one of the 50 States or the District of Columbia as medical assistance for medication-assisted treatment (as defined in subsection (ee)(1)). . (b) State option To provide recovery support services as part of medication-Assisted treatment Section 1905(ee)(1) of the Social Security Act ( 42 U.S.C. 1396d(ee)(1) ) is amended— (1) in subparagraph (A), by striking ; and and inserting a semicolon; (2) in subparagraph (B), by striking the period at the end and inserting ; and ; and (3) by adding at the end the following new subparagraph: (C) at the option of a State, includes recovery support services, such as peer counseling and transportation, that are provided to an individual in conjunction with the provision of such drugs and biological products to support the individual in maintaining a healthy lifestyle following opioid misuse treatment. .