Added randomizeChoices support