Adapted CH to the next graph definition.