Added DB check for Unit of Measure