Better handling of vp fields