Refactored converters, to make them compatible with Meta