JC: removed wfid in model. Updated db for other engines. spec passes.