Added support for a few different formats (other than PCM)