Adding VPP support