Added generators, simplified grammar for testing