Viprcli and vmax support changes