Added Support for Reconnection