Collect common functions in wf package.
OK, now update to use WF package.