Refactored converters