Added detection of external adaptor in addition to junction adaptor.