; (2) determine if updates to FAA Form 7460 and Form 7480 are necessary and update such forms, as appropriate; and (3) ensure that the methodology and underlying data sources of the Terminal Area Forecast of the FAA include commercial operations conducted by aircraft regardless of propulsion type or fuel type. 959. Charting of aviation infrastructure The Administrator shall increase efforts to update and keep current the Airport Master Record of the FAA, including by establishing a streamlined process by which the owners and operators of public and private aviation facilities with nontemporary, nonintermittent operations are encouraged to keep the information on such facilities current. 960. Advanced air mobility infrastructure pilot program extension Section 101 of division Q of the Consolidated Appropriations Act, 2023 ( 49 U.S.C. 40101 note) is amended— (1) in subsection (b)— (A) in paragraph (2)— (i) in subparagraph (A) by inserting , as well as the use of existing airport and heliport infrastructure that may require modifications to safely accommodate AAM operations, after vertiport infrastructure ; and (ii) in subparagraph (B)— (I) in clause (iii) by striking vertiport and inserting locations for ; (II) in clause (iv) by inserting and guidance after any standards ; (III) in clause (v) by striking vertiport infrastructure and inserting urban air mobility and regional air mobility operations ; and (IV) in clause (x) by inserting or the modification of aviation infrastructure after operation of a vertiport ; (B) in paragraph (4)(B) by inserting the Department of Defense, the National Guard, before or ; and (C) in paragraph (6)— (i) in subparagraph (A) by striking September 30, 2025 and inserting September 30, 2027 ; and (ii) in subparagraph (B)— (I) in clause (i) by striking and at the end; (II) in clause (ii) by striking the period at the end and inserting ; and