Add optional multi-connection support (used by default)