Done more work on entity classes.