Use internal classes for codecs