Updates to entity classes