Added more codecs