diff --git a/syntax-visualizer/example/foo.php.ast b/syntax-visualizer/example/foo.php.ast
index 30edf2f5..71f6bf8a 100644
--- a/syntax-visualizer/example/foo.php.ast
+++ b/syntax-visualizer/example/foo.php.ast
@@ -1,180 +1,177 @@
 {
     "SourceFileNode": {
-        "scriptSectionList": [
+        "statementList": [
             {
-                "ScriptSection": {
-                    "text": {
-                        "kind": "ScriptSectionPrependedText",
-                        "fullStart": 0,
-                        "start": 0,
-                        "length": 0
-                    },
-                    "startTag": {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
                         "kind": "ScriptSectionStartTag",
                         "fullStart": 0,
                         "start": 0,
                         "length": 6
+                    }
+                }
+            },
+            {
+                "ClassDeclaration": {
+                    "attributes": null,
+                    "abstractOrFinalModifier": null,
+                    "modifiers": [],
+                    "classKeyword": {
+                        "kind": "ClassKeyword",
+                        "fullStart": 6,
+                        "start": 21,
+                        "length": 20
                     },
-                    "statementList": [
-                        {
-                            "ClassNode": {
-                                "abstractOrFinalModifier": null,
-                                "classKeyword": {
-                                    "kind": "ClassKeyword",
-                                    "fullStart": 6,
-                                    "start": 24,
-                                    "length": 23
-                                },
-                                "name": {
-                                    "error": "MissingToken",
-                                    "kind": "Name",
-                                    "fullStart": 29,
-                                    "start": 29,
-                                    "length": 0
-                                },
-                                "classBaseClause": null,
-                                "classInterfaceClause": null,
-                                "classMembers": {
-                                    "ClassMembersNode": {
-                                        "openBrace": {
-                                            "kind": "OpenBraceToken",
-                                            "fullStart": 29,
-                                            "start": 30,
+                    "name": {
+                        "error": "MissingToken",
+                        "kind": "Name",
+                        "fullStart": 26,
+                        "start": 26,
+                        "length": 0
+                    },
+                    "classBaseClause": null,
+                    "classInterfaceClause": null,
+                    "classMembers": {
+                        "ClassMembersNode": {
+                            "openBrace": {
+                                "kind": "OpenBraceToken",
+                                "fullStart": 26,
+                                "start": 27,
+                                "length": 2
+                            },
+                            "classMemberDeclarations": [
+                                {
+                                    "MethodDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [],
+                                        "functionKeyword": {
+                                            "kind": "FunctionKeyword",
+                                            "fullStart": 28,
+                                            "start": 33,
+                                            "length": 13
+                                        },
+                                        "byRefToken": null,
+                                        "name": {
+                                            "kind": "Name",
+                                            "fullStart": 41,
+                                            "start": 42,
                                             "length": 2
                                         },
-                                        "classMemberDeclarations": [
-                                            {
-                                                "MethodNode": {
-                                                    "modifiers": [],
-                                                    "functionKeyword": {
-                                                        "kind": "FunctionKeyword",
-                                                        "fullStart": 31,
-                                                        "start": 37,
-                                                        "length": 14
-                                                    },
-                                                    "byRefToken": null,
-                                                    "name": {
-                                                        "kind": "Name",
-                                                        "fullStart": 45,
-                                                        "start": 46,
-                                                        "length": 2
-                                                    },
-                                                    "openParen": {
-                                                        "kind": "OpenParenToken",
-                                                        "fullStart": 47,
-                                                        "start": 48,
-                                                        "length": 2
-                                                    },
-                                                    "parameters": null,
-                                                    "closeParen": {
-                                                        "kind": "CloseParenToken",
-                                                        "fullStart": 49,
-                                                        "start": 49,
-                                                        "length": 1
-                                                    },
-                                                    "colonToken": null,
-                                                    "returnType": null,
-                                                    "compoundStatementOrSemicolon": {
-                                                        "CompoundStatementNode": {
-                                                            "children": [
-                                                                {
-                                                                    "kind": "OpenBraceToken",
-                                                                    "fullStart": 50,
-                                                                    "start": 51,
-                                                                    "length": 2
-                                                                },
-                                                                {
-                                                                    "error": "MissingToken",
-                                                                    "kind": "CloseBraceToken",
-                                                                    "fullStart": 52,
-                                                                    "start": 52,
-                                                                    "length": 0
-                                                                }
-                                                            ]
-                                                        }
-                                                    }
+                                        "openParen": {
+                                            "kind": "OpenParenToken",
+                                            "fullStart": 43,
+                                            "start": 44,
+                                            "length": 2
+                                        },
+                                        "parameters": null,
+                                        "closeParen": {
+                                            "kind": "CloseParenToken",
+                                            "fullStart": 45,
+                                            "start": 45,
+                                            "length": 1
+                                        },
+                                        "colonToken": null,
+                                        "questionToken": null,
+                                        "returnTypeList": null,
+                                        "compoundStatementOrSemicolon": {
+                                            "CompoundStatementNode": {
+                                                "openBrace": {
+                                                    "kind": "OpenBraceToken",
+                                                    "fullStart": 46,
+                                                    "start": 47,
+                                                    "length": 2
+                                                },
+                                                "statements": [],
+                                                "closeBrace": {
+                                                    "error": "MissingToken",
+                                                    "kind": "CloseBraceToken",
+                                                    "fullStart": 48,
+                                                    "start": 48,
+                                                    "length": 0
                                                 }
-                                            },
+                                            }
+                                        }
+                                    }
+                                },
+                                {
+                                    "MethodDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
                                             {
-                                                "MethodNode": {
-                                                    "modifiers": [
-                                                        {
-                                                            "kind": "PublicKeyword",
-                                                            "fullStart": 52,
-                                                            "start": 60,
-                                                            "length": 14
-                                                        }
-                                                    ],
-                                                    "functionKeyword": {
-                                                        "kind": "FunctionKeyword",
-                                                        "fullStart": 66,
-                                                        "start": 67,
-                                                        "length": 9
-                                                    },
-                                                    "byRefToken": null,
-                                                    "name": {
-                                                        "kind": "Name",
-                                                        "fullStart": 75,
-                                                        "start": 76,
-                                                        "length": 2
-                                                    },
-                                                    "openParen": {
-                                                        "kind": "OpenParenToken",
-                                                        "fullStart": 77,
-                                                        "start": 78,
-                                                        "length": 2
-                                                    },
-                                                    "parameters": null,
-                                                    "closeParen": {
-                                                        "kind": "CloseParenToken",
-                                                        "fullStart": 79,
-                                                        "start": 79,
-                                                        "length": 1
-                                                    },
-                                                    "colonToken": null,
-                                                    "returnType": null,
-                                                    "compoundStatementOrSemicolon": {
-                                                        "CompoundStatementNode": {
-                                                            "children": [
-                                                                {
-                                                                    "kind": "OpenBraceToken",
-                                                                    "fullStart": 80,
-                                                                    "start": 81,
-                                                                    "length": 2
-                                                                },
-                                                                {
-                                                                    "kind": "CloseBraceToken",
-                                                                    "fullStart": 82,
-                                                                    "start": 83,
-                                                                    "length": 2
-                                                                }
-                                                            ]
-                                                        }
-                                                    }
-                                                }
+                                                "kind": "PublicKeyword",
+                                                "fullStart": 48,
+                                                "start": 54,
+                                                "length": 12
                                             }
                                         ],
-                                        "closeBrace": {
-                                            "error": "MissingToken",
-                                            "kind": "CloseBraceToken",
-                                            "fullStart": 84,
-                                            "start": 84,
-                                            "length": 0
+                                        "functionKeyword": {
+                                            "kind": "FunctionKeyword",
+                                            "fullStart": 60,
+                                            "start": 61,
+                                            "length": 9
+                                        },
+                                        "byRefToken": null,
+                                        "name": {
+                                            "kind": "Name",
+                                            "fullStart": 69,
+                                            "start": 70,
+                                            "length": 2
+                                        },
+                                        "openParen": {
+                                            "kind": "OpenParenToken",
+                                            "fullStart": 71,
+                                            "start": 72,
+                                            "length": 2
+                                        },
+                                        "parameters": null,
+                                        "closeParen": {
+                                            "kind": "CloseParenToken",
+                                            "fullStart": 73,
+                                            "start": 73,
+                                            "length": 1
+                                        },
+                                        "colonToken": null,
+                                        "questionToken": null,
+                                        "returnTypeList": null,
+                                        "compoundStatementOrSemicolon": {
+                                            "CompoundStatementNode": {
+                                                "openBrace": {
+                                                    "kind": "OpenBraceToken",
+                                                    "fullStart": 74,
+                                                    "start": 75,
+                                                    "length": 2
+                                                },
+                                                "statements": [],
+                                                "closeBrace": {
+                                                    "kind": "CloseBraceToken",
+                                                    "fullStart": 76,
+                                                    "start": 77,
+                                                    "length": 2
+                                                }
+                                            }
                                         }
                                     }
                                 }
+                            ],
+                            "closeBrace": {
+                                "error": "MissingToken",
+                                "kind": "CloseBraceToken",
+                                "fullStart": 78,
+                                "start": 78,
+                                "length": 0
                             }
                         }
-                    ],
-                    "endTag": null
+                    }
                 }
             }
         ],
         "endOfFileToken": {
             "kind": "EndOfFileToken",
-            "fullStart": 84,
-            "start": 86,
-            "length": 2
+            "fullStart": 78,
+            "start": 79,
+            "length": 1
         }
     }
 }
\ No newline at end of file