Add multi connection handling