Add more grammar
Add more grammar and some AST nodes