; (2) Federal law enforcement agencies, including Federal prosecutors; and (3) other Federal criminal justice agencies that the Attorney General deems appropriate. C Oversight of Mental Health and Substance Abuse Treatment 604. Authorizing grants to States for the use of medication-assisted treatment for heroin, opioid, or alcohol abuse in residential substance abuse treatment (a) In general Section 1904 of the Omnibus Crime Control and Safe Streets Act of 1968 ( 42 U.S.C. 3796ff–3 ) is amended— (1) in subsection (d), by striking pharmacological treatment and inserting pharmacological treatment or medication assisted treatment not subject to diversion ; and (2) by adding at the end the following: (e) Definitions In this section— (1) the term medication assisted treatment means the use of medications approved by the Food and Drug Administration, in combination with counseling or behavioral therapies, to treat heroin, opioid, or alcohol addiction