Entity improvement