Apple Default Maps App Getting Public Transportation Directions

May 21, 2015 1:03 PM EDT

Your iPhone is about to get way more useful for navigating around big cities.

Apple’s upcoming iOS 9 update will add public transportation data to the default Maps app, according to 9to5Mac. The company will reportedly unveil bus, subway and train directions within the app at the Worldwide Developers Conference in June.

This is the first time Apple’s Maps app will include public transit data since the company stopped using Google’s mapping data in 2012. Apple was reportedly planning on including the new features in iOS 8, but pulled them at the last minute because of personnel and data issues.

Sources also told 9to5Mac that Apple is making progress with an indoor mapping project to help users find their way inside large buildings and landmarks. However, it’s unclear when that will be released.

PHOTOS: The Rise of Mobile Phones from 1916 to Today

**1916** A German field telephone station in the Aisne department of northern France during World War I.Paul Thompson—FPG/Getty Images

**1970** French singer and actor Johnny Hallyday in a scene from the film 'Point de Chute' (aka 'Falling Point').Keystone/Holton/Getty Images

**1980** An early mobile phone during the Iranian Embassy siege at Princes Gate in South Kensington, London.Kypros/Getty Images

Bob Maxwell, general manager of Englewood-based Mobile Telephone of Colorado, places a call on FCC-approved radio frequency while driving to work. — **1983** Bob Maxwell, general manager of Englewood-based Mobile Telephone of Colorado, places a call on an FCC-approved radio frequency while driving to work.Lyn Alweis—Denver Post/Getty Images

THE A-TEAM -- "The Say U.N.C.L.E. Affair" Episode 5. (l-r) Eddie Velez as Frankie Santana, Robert Vaughn as General Hunt Stockwell, George Peppard as John 'Hannibal' Smith. — **1986** THE A-TEAM "The Say U.N.C.L.E. Affair" Episode 5. (l-r) Eddie Velez as Frankie Santana, Robert Vaughn as General Hunt Stockwell, George Peppard as John 'Hannibal' Smith.Bill Dow—NBC/Getty Images

Bill Clinton, Ray Flynn — **1992** Democratic presidential nominee Bill Clinton talks on a cell phone while meeting with Boston Mayor Ray Flynn in a New York hotel on Sept. 25.Mark Lennihan—AP

**1993** Whoopi Goldberg during ShoWest in Las Vegas.Jeff Kravitz—FilmMagic/Getty Images

**1997** A farmer with his family sitting on a Bullock Cart and talking on a mobile Phone, in Delhi.India Today Group/Getty Images

World Trade Center Terrorist Attack. — **2001** A woman watches smoke pour out of the World Trade Center Towers in New York on September 11.Nicholas Goldberg—Gamma-Rapho/Getty Images

A rebel militiaman speaks on his mobile phone after capturing territory from government troops on March 25 2 in Ben Jawat, Libya. — **2011** A rebel militiaman speaks on his mobile phone after capturing territory from government troops on March 25 in Ben Jawat, Libya. John Moore—Getty Images

**2011** A youth films the aftermath of tear gas police fired at protestors in Muhammed Mahmoud Street near Tahrir Square on November 23 in Cairo.Peter Macdiarmid—Getty Images

**2012** Audience members take pictures of President Barack Obama at Florida Atlantic University on April 10 in Boca Raton, Florida. Marc Serota—Getty Images

**2014** A teenager takes a selfie in front of Queen Elizabeth II during a walk around St. Georges Market in Belfast. The Queen has apparently voiced her dismay that when she carries out engagements she is greeted by a sea of mobile phones.Peter Macdiarmid—PA Wire/Press Association Images/AP

The Worst Thing About the iPhone Is About to Be Fixed

PHOTOS: The Rise of Mobile Phones from 1916 to Today

More Must-Reads from TIME