Updated entity view