Added auto-reconnect