Added UOMs to derived metrics