Updated to work with wf@0.9.7. Finally!