Converter refactored