Update enunciate models to have getters and setters