Add automatic connection management capability