ConnectContext improved