Add disjunction and choice.