Added some more model refinement