Fix connected support to be more general.