Improved VPK handling