Added more entity types to have more than 2 topics