Didn't we want to change it to block until add single/batch connection(s) finish? Or should it be async w/ option of waiting for async tasks to complete?