Update vf generation to use new macro