Add MCVS and MCHS multichoice types with shuffling of answers