Added grammar class