Enhance CONNECTED_VIA Annotation
Minor ds fixes