Add the choose combinator and update the zero or more combinator