Added ability to group choice attribute options.