Added generators to grammar