Adding reconnect-on-failure