Consolidated 2port/3port and added bgp opaque routes