More work on entity classes.