Better handling of default connection behavior