Added two more cases for ConnectCommand.