improve entities