Added extra mechanisms to prevent connector pool overflowing