Handle more connection cases