Further work on reconnect API