Almost done with connection management