converting models to use enums