Improved connections management