Started wf variables refactoring