Add connection awareness