VTF encapsulation
VTF refactor