; and (B) storage and transportation capacity (including owned and leased capacity). (3) Protection of proprietary information Section 12(f) of the Federal Energy Administration Act of 1974 ( 15 U.S.C. 771(f) ) shall apply to information collected under this subsection. (o) Collection of information on storage capacity for oil and natural gas (1) In general Not later than 90 days after the date of enactment of this subsection, the Administrator of the Energy Information Administration shall collect information quantifying the commercial storage capacity for oil and natural gas in the United States. (2) Updates The Administrator shall update annually the information required under paragraph (1). (3) Protection of proprietary information Section 12(f) of the Federal Energy Administration Act of 1974 ( 15 U.S.C. 771(f) ) shall apply to information collected under this subsection. (p) Financial market analysis office (1) Establishment There shall be within the Energy Information Administration a Financial Market Analysis Office. (2) Duties The Office shall— (A) be responsible for analysis of the financial aspects of energy markets; (B) review the reports required by section 4403(c) of the Energy and Natural Resources Act of 2017 in advance of the submission of the reports to Congress; and (C) not later than 1 year after the date of enactment of this subsection— (i) make recommendations to the Administrator of the Energy Information Administration that identify and quantify any additional resources that are required to improve the ability of the Energy Information Administration to more fully integrate financial market information into the analyses and forecasts of the Energy Information Administration; (ii) conduct a review of implications of policy changes (including changes in export or import policies) and changes in how crude oil and refined petroleum products are transported with respect to price formation of crude oil and refined petroleum products