Improved uom further