added nickname support