Refactor UOM internalising