Add optional multi-connection support (used by default)

Think this works