Added more entities related to questions