[FOLD] Fill in Connection map logic