Converter refactoring