Improve dart version of the converter