Update to refactored converters