Updated entity model and views/controllers