Separate wfm-client and wfm