Added ReconnectionPolicy support