Improve the entity behavior