Added ability for prefixed UOMs and Updated Translations