Added more symbol-table/parser logic