Added support for disambiguating athlete names