added choice pattern to grammar