Better handling of vp fields for all exports