Refactoring of the converter design