Added grammar and classes