Added the start of VSTP support