Add support for nicklist