Updates to Connection map design