Improve model templates