More entity type annotations in sample code.