Improve entity class