Added terminals and non-terminals for parser