Added Nick Name support