updated entity model