refactor ConnectionMap
Refactor ConnectionMap