Add connection awareness support.