[FOLD] Add Connections and use map instead of Multi-index