; Public Law 109–54 ) is amended by striking September 30, 2019 and inserting September 30, 2029 . (b) Authorization for lease of Forest Service administrative sites Section 8623 of the Agriculture Improvement Act of 2018 ( 16 U.S.C. 580d note; Public Law 115–334 ) is amended— (1) in subsection (a)(2)(D), by striking dwelling; and inserting dwelling or multiunit dwelling; ; (2) in subsection (e)— (A) in paragraph (3)(B)(ii)— (i) in subclause (I), by inserting such as housing, after improvements, ; (ii) in subclause (II), by striking and at the end; (iii) in subclause (III), by striking or at the end and inserting and ; and (iv) by adding at the end the following: (IV) services occurring off the administrative site that— (aa) occur at another administrative site on the same or a different unit of the National Forest System in which the administrative site is located; (bb) benefit the National Forest System; and (cc) support activities occurring within the unit of the National Forest System in which the administrative site is located; or ; and (B) by adding at the end the following: (6) Lease term The term of a lease of an administrative site under this section shall be not greater than 100 years. ; (3) in subsection (g)— (A) by inserting (or other party) after leaseholder ; and (B) by inserting or constructed after improved ; and (4) in subsection (i), by striking 2023 each place it appears and inserting 2029 . 8304. Forest inventory and analysis (a) In general Section 3(e) of the Forest and Rangeland Renewable Resources Research Act of 1978 ( 16 U.S.C. 1642(e) ) is amended— (1) in paragraph (1)— (A) by striking their resources and inserting the resources of those forests, including forest carbon, ; (B) by striking In compliance and inserting the following: (A) In general In compliance ; and (C) by adding at the end the following: (B) Additional methods Under the program under this subsection, the Secretary shall carry out, as a data collection method— (i) a national timber products output survey