Adding more entity types.