Converted ConnectionManager to use BiDirectionalMap