Updated entity classes