Added more entity type