Improve the performance of the connection manager