Add support for nicknames