Updated unit converter to work with mass units