Switch to new VDF parser