Added choices support.