Change Connection scheme to adhere the RFC