SOUTH LAKE TAHOE, Nevada (AP) — Tahoe city officials are considering an airport master plan that would allow more uses on land designated for aviation activities alone.

The Tahoe Daily Tribune reports the plan will be largely funded by the Federal Aviation Administration, which requires the inclusion of certain safety upgrades to the Lake Tahoe Airport’s 1992 standards.

The design is one component of a 20-year master plan for the airport. The city is working to complete airport designs, finalize a draft report and go out for bid on an environmental analysis to be submitted to the FAA for approval.

City consultant C&S Companies was hired three years ago to conduct research. Vice president Michael Hotaling says he expects the FAA to begin reviewing the master plan by late 2016.