Further changes to take into account Chembl 16