Added grammar validations