Updated grammar and added some class of statements