Upgrading for compatibility with wf@0.9.x (WIP)