Improvements to model