later than 30 days after the date of enactment of this Act, the Secretary of Homeland Security shall submit to the Committees on Appropriations of the Senate and the House of Representatives, the Committees on the Judiciary of the Senate and the House of Representatives, the Committee on Homeland Security and Governmental Affairs of the Senate, and the Committee on Homeland Security of the House of Representatives, a report for fiscal year 2018 on visa overstay data by country as required by section 1376 of title 8, United States Code: Provided , That the report on visa overstay data shall also include— (1) overstays from all nonimmigrant visa categories under the immigration laws, delineated by each of the classes and sub-classes of such categories