Properly indexes all of the connections now