We've known most of the big details about Apple Music since Apple officially announced it at WWDC earlier this month: it launches on June 30, it costs $10 per month or $15 per month for families of up to six people, and it comes with a three-month free trial that up until recently was causing some grief for Taylor Swift and other independent artists. But questions about how it would interact with other paid Apple services, most notably iTunes Match, remained.

Apple software and services SVP Eddy Cue took to Twitter to answer some questions yesterday, and now we know more: Apple Music will include song-matching functionality similar to iTunes Match. If a song you have in your library isn't present in the Apple Music library or in your iTunes purchases, you should be able to upload it to Apple and play it from any device associated with your Apple ID. Apple has been pretty evasive about the depth and breadth of the Apple Music library—we only know that it won't include everything in the regular iTunes Store, but new deals are still being struck—so this should come as a comfort to people with specific tracks that don't end up in the catalog.

In iOS 8, Cue says that Apple Music will stick to iTunes Match's 25,000-song limit. In iOS 9, the company is "working" to increase that limit to 100,000 songs.

It's worth noting that while Match's functionality appears to be included in Apple Music, Cue didn't say that Match would be discontinued. At $25 a year, the service is significantly cheaper than Apple Music, so if you only want the song-uploading features without the à la carte streaming, it looks like you still have that option.

Other tidbits tweeted by Cue: developers running current iOS 9 betas will get Apple Music in a new version of the beta, and the current Beats app will be updated to migrate users to Apple Music at some point. Apple Music requires iOS 8.4 and its redesigned music app, which is said to be launching at 8am Pacific (11am Eastern) tomorrow morning.