MPLS infrastructure improvments