Update for var based plan-fn's
Update vmfest dependencies