Update grammar, add symbols