Revise model to run in wide format.