Improved entity class.