Modifed _make_vrf_dict