More changes in connection manager