updated entity defs