made change for code review feedback: add wait for methods complete, rename for excluded connection Id