Added feature to expose normalizeUnits