Changed the way entity values are used