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.