Match the mapping with ChEMBL
Added more units, and mapping from/to UO