ConnectData improvement