ChoiceList and ChoiceItem Revision