Changed the key struct in Connection.cc and Connection.hh to be less convoluted.