Switch to Converter base class