Improve model