Minor changes
Map connections by unique ID