Added support for multiple audio formats