Refactoring
Use new VDF parser