Change ConnectionManager to keep track of Connection objects instead of a Map