Improved Client connection management.