Attempt to add support for additional codecs