Improved connection management.