improve enum, add model