Changes for supporting Question Groups