Improve model specs