Apple is adding several new airport terminal maps to its Maps app as part of the latest update to iOS 11, the operating system for iPhones and the company’s other mobile devices, Ars Technica reports.

The beta release of iOS 11 included maps of two airports — San Jose International (SJC) and Philadelphia International (PHL) — with the promise of more to come.

With the full release of the operating system update, the Maps app now also features terminal maps of Oakland International (OAK), Miami International (MIA), Minneapolis-St. Paul International (MSP), Baltimore–Washington International (BWI), Portland International (PDX), McCarran International in Las Vegas (LAS), Chicago/O’Hare International (ORD), and Midway International (MDW).

Map details include terminal layouts, security checkpoint and gate locations, and markers for hotels, restaurants, and shops.

At Apple’s 2017 developer’s conference, company officials also signaled their intention to add more than 20 other airport maps in the near future, including:

  • Amsterdam (AMS)
  • Berlin (TXL, SXF)
  • Denver (DEN)
  • Detroit (DTW)
  • Doha (DOH)
  • Dubai (DXB)
  • Geneva (GVA)
  • Hong Kong (HKG)
  • Houston (HOU, IAH)
  • Indianapolis (IND)
  • Jacksonville (JAX)
  • London (LHR, LGW)
  • Los Angeles (LAX, SNA)
  • Nashville (BNA)
  • New York (JFK, LGA)
  • Newark (EWR)
  • Pittsburgh (PIT)
  • San Diego (SAN)
  • Seattle (SEA)
  • Toronto (YYZ)
  • Vancouver (YVR)