Added more units, used by ChEMBL 17