Add nickname support