improved wm_model, add two new fileds into the tbale