Big refactor of converters