Refactor to separate GsConverter