Refactoring
VPK, VDF