Added additional NICK syntax support