Add better support for other audio sources