Improved connectivity handling