Adding concurrent connection support