diff --git a/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json b/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json
index c6e1d667a..535791eb3 100644
--- a/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json
@@ -258,26 +258,6 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1314",
   "fields":[{"name":"0bitmap$1206"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1315",
-  "fields":[{"name":"0bitmap$1205"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1316",
-  "fields":[{"name":"0bitmap$1201"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1317",
-  "fields":[{"name":"0bitmap$1202"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1318",
-  "fields":[{"name":"0bitmap$1203"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1319",
-  "fields":[{"name":"0bitmap$1204"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1321",
   "fields":[{"name":"0bitmap$1211"}]
@@ -1078,26 +1058,6 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1879",
   "fields":[{"name":"0bitmap$1729"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1880",
-  "fields":[{"name":"0bitmap$1728"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1881",
-  "fields":[{"name":"0bitmap$1724"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1882",
-  "fields":[{"name":"0bitmap$1725"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1883",
-  "fields":[{"name":"0bitmap$1726"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1884",
-  "fields":[{"name":"0bitmap$1727"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1886",
   "fields":[{"name":"0bitmap$1734"}]
@@ -1822,6 +1782,30 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2196",
   "fields":[{"name":"0bitmap$2040"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2197",
+  "fields":[{"name":"0bitmap$2029"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2199",
+  "fields":[{"name":"0bitmap$2031"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2200",
+  "fields":[{"name":"0bitmap$2030"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2201",
+  "fields":[{"name":"0bitmap$2033"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2203",
+  "fields":[{"name":"0bitmap$2036"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2206",
+  "fields":[{"name":"0bitmap$2039"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2210",
   "fields":[{"name":"0bitmap$2053"}]
@@ -1966,6 +1950,30 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2280",
   "fields":[{"name":"0bitmap$2118"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2281",
+  "fields":[{"name":"0bitmap$2107"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2283",
+  "fields":[{"name":"0bitmap$2109"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2284",
+  "fields":[{"name":"0bitmap$2108"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2285",
+  "fields":[{"name":"0bitmap$2111"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2287",
+  "fields":[{"name":"0bitmap$2114"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2290",
+  "fields":[{"name":"0bitmap$2117"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2294",
   "fields":[{"name":"0bitmap$2131"}]
@@ -1998,6 +2006,30 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2308",
   "fields":[{"name":"0bitmap$2144"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2309",
+  "fields":[{"name":"0bitmap$2133"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2311",
+  "fields":[{"name":"0bitmap$2135"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2312",
+  "fields":[{"name":"0bitmap$2134"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2313",
+  "fields":[{"name":"0bitmap$2137"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2315",
+  "fields":[{"name":"0bitmap$2140"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2318",
+  "fields":[{"name":"0bitmap$2143"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2322",
   "fields":[{"name":"0bitmap$2157"}]
@@ -2058,14 +2090,86 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2350",
   "fields":[{"name":"0bitmap$2183"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2351",
+  "fields":[{"name":"0bitmap$2172"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2353",
+  "fields":[{"name":"0bitmap$2174"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2354",
+  "fields":[{"name":"0bitmap$2173"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2355",
+  "fields":[{"name":"0bitmap$2176"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2357",
+  "fields":[{"name":"0bitmap$2179"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2360",
+  "fields":[{"name":"0bitmap$2182"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2364",
   "fields":[{"name":"0bitmap$2196"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2365",
+  "fields":[{"name":"0bitmap$2185"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2367",
+  "fields":[{"name":"0bitmap$2187"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2368",
+  "fields":[{"name":"0bitmap$2186"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2369",
+  "fields":[{"name":"0bitmap$2189"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2371",
+  "fields":[{"name":"0bitmap$2192"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2374",
+  "fields":[{"name":"0bitmap$2195"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2378",
   "fields":[{"name":"0bitmap$2209"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2379",
+  "fields":[{"name":"0bitmap$2198"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2381",
+  "fields":[{"name":"0bitmap$2200"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2382",
+  "fields":[{"name":"0bitmap$2199"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2383",
+  "fields":[{"name":"0bitmap$2202"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2385",
+  "fields":[{"name":"0bitmap$2205"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2388",
+  "fields":[{"name":"0bitmap$2208"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2392",
   "fields":[{"name":"0bitmap$2222"}]
@@ -2126,6 +2230,30 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2420",
   "fields":[{"name":"0bitmap$2248"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2421",
+  "fields":[{"name":"0bitmap$2237"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2423",
+  "fields":[{"name":"0bitmap$2239"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2424",
+  "fields":[{"name":"0bitmap$2238"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2425",
+  "fields":[{"name":"0bitmap$2241"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2427",
+  "fields":[{"name":"0bitmap$2244"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2430",
+  "fields":[{"name":"0bitmap$2247"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2434",
   "fields":[{"name":"0bitmap$2261"}]
@@ -2218,10 +2346,34 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2476",
   "fields":[{"name":"0bitmap$2300"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2477",
+  "fields":[{"name":"0bitmap$2289"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2479",
+  "fields":[{"name":"0bitmap$2291"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$248",
   "fields":[{"name":"0bitmap$227"}]
 },
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2480",
+  "fields":[{"name":"0bitmap$2290"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2481",
+  "fields":[{"name":"0bitmap$2293"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2483",
+  "fields":[{"name":"0bitmap$2296"}]
+},
+{
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2486",
+  "fields":[{"name":"0bitmap$2299"}]
+},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$249",
   "fields":[{"name":"0bitmap$224"}]
@@ -3447,24 +3599,20 @@
   "fields":[{"name":"0bitmap$106"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$115",
-  "fields":[{"name":"0bitmap$129"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$116",
-  "fields":[{"name":"0bitmap$113"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$114",
+  "fields":[{"name":"0bitmap$110"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$117",
-  "fields":[{"name":"0bitmap$112"}]
+  "fields":[{"name":"0bitmap$133"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$118",
-  "fields":[{"name":"0bitmap$110"}]
+  "fields":[{"name":"0bitmap$115"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$119",
-  "fields":[{"name":"0bitmap$111"}]
+  "fields":[{"name":"0bitmap$114"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$12",
@@ -3472,31 +3620,31 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$120",
-  "fields":[{"name":"0bitmap$115"}]
+  "fields":[{"name":"0bitmap$112"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$121",
-  "fields":[{"name":"0bitmap$114"}]
+  "fields":[{"name":"0bitmap$113"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$122",
-  "fields":[{"name":"0bitmap$118"}]
+  "fields":[{"name":"0bitmap$117"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$123",
-  "fields":[{"name":"0bitmap$117"}]
+  "fields":[{"name":"0bitmap$116"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$124",
-  "fields":[{"name":"0bitmap$116"}]
+  "fields":[{"name":"0bitmap$120"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$125",
-  "fields":[{"name":"0bitmap$120"}]
+  "fields":[{"name":"0bitmap$119"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$126",
-  "fields":[{"name":"0bitmap$119"}]
+  "fields":[{"name":"0bitmap$118"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$127",
@@ -3508,7 +3656,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$129",
-  "fields":[{"name":"0bitmap$128"}]
+  "fields":[{"name":"0bitmap$124"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$13",
@@ -3516,71 +3664,67 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$130",
-  "fields":[{"name":"0bitmap$127"}]
+  "fields":[{"name":"0bitmap$123"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$131",
-  "fields":[{"name":"0bitmap$126"}]
+  "fields":[{"name":"0bitmap$130"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$132",
-  "fields":[{"name":"0bitmap$124"}]
+  "fields":[{"name":"0bitmap$129"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$133",
-  "fields":[{"name":"0bitmap$123"}]
+  "fields":[{"name":"0bitmap$128"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$134",
+  "fields":[{"name":"0bitmap$126"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$135",
   "fields":[{"name":"0bitmap$125"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$136",
-  "fields":[{"name":"0bitmap$147"}]
+  "fields":[{"name":"0bitmap$127"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$137",
-  "fields":[{"name":"0bitmap$133"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$138",
   "fields":[{"name":"0bitmap$132"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$139",
-  "fields":[{"name":"0bitmap$130"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$14",
   "fields":[{"name":"0bitmap$11"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$140",
-  "fields":[{"name":"0bitmap$131"}]
+  "fields":[{"name":"0bitmap$151"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$142",
-  "fields":[{"name":"0bitmap$143"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$141",
+  "fields":[{"name":"0bitmap$137"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$143",
-  "fields":[{"name":"0bitmap$142"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$142",
+  "fields":[{"name":"0bitmap$136"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$144",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$143",
   "fields":[{"name":"0bitmap$134"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$145",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$144",
   "fields":[{"name":"0bitmap$135"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$146",
-  "fields":[{"name":"0bitmap$136"}]
+  "fields":[{"name":"0bitmap$147"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$147",
-  "fields":[{"name":"0bitmap$137"}]
+  "fields":[{"name":"0bitmap$146"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$148",
@@ -3602,21 +3746,25 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$151",
   "fields":[{"name":"0bitmap$141"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$152",
+  "fields":[{"name":"0bitmap$142"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$153",
-  "fields":[{"name":"0bitmap$144"}]
+  "fields":[{"name":"0bitmap$143"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$154",
-  "fields":[{"name":"0bitmap$145"}]
+  "fields":[{"name":"0bitmap$144"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$155",
-  "fields":[{"name":"0bitmap$146"}]
+  "fields":[{"name":"0bitmap$145"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$157",
-  "fields":[{"name":"0bitmap$273"}]
+  "fields":[{"name":"0bitmap$148"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$158",
@@ -3624,19 +3772,15 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$159",
-  "fields":[{"name":"0bitmap$148"}]
+  "fields":[{"name":"0bitmap$150"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$16",
   "fields":[{"name":"0bitmap$15"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$160",
-  "fields":[{"name":"0bitmap$151"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$161",
-  "fields":[{"name":"0bitmap$150"}]
+  "fields":[{"name":"0bitmap$277"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$162",
@@ -3656,19 +3800,19 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$166",
-  "fields":[{"name":"0bitmap$158"}]
+  "fields":[{"name":"0bitmap$157"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$167",
-  "fields":[{"name":"0bitmap$157"}]
+  "fields":[{"name":"0bitmap$156"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$168",
-  "fields":[{"name":"0bitmap$156"}]
+  "fields":[{"name":"0bitmap$159"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$169",
-  "fields":[{"name":"0bitmap$160"}]
+  "fields":[{"name":"0bitmap$158"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$17",
@@ -3676,67 +3820,71 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$170",
-  "fields":[{"name":"0bitmap$159"}]
+  "fields":[{"name":"0bitmap$162"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$171",
-  "fields":[{"name":"0bitmap$163"}]
+  "fields":[{"name":"0bitmap$161"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$172",
-  "fields":[{"name":"0bitmap$162"}]
+  "fields":[{"name":"0bitmap$160"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$173",
-  "fields":[{"name":"0bitmap$161"}]
+  "fields":[{"name":"0bitmap$164"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$174",
-  "fields":[{"name":"0bitmap$178"}]
+  "fields":[{"name":"0bitmap$163"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$175",
-  "fields":[{"name":"0bitmap$177"}]
+  "fields":[{"name":"0bitmap$167"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$176",
-  "fields":[{"name":"0bitmap$167"}]
+  "fields":[{"name":"0bitmap$166"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$177",
-  "fields":[{"name":"0bitmap$164"}]
+  "fields":[{"name":"0bitmap$165"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$178",
-  "fields":[{"name":"0bitmap$165"}]
+  "fields":[{"name":"0bitmap$182"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$179",
-  "fields":[{"name":"0bitmap$166"}]
+  "fields":[{"name":"0bitmap$181"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$18",
   "fields":[{"name":"0bitmap$17"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$181",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$180",
   "fields":[{"name":"0bitmap$171"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$181",
+  "fields":[{"name":"0bitmap$168"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$182",
-  "fields":[{"name":"0bitmap$170"}]
+  "fields":[{"name":"0bitmap$169"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$183",
-  "fields":[{"name":"0bitmap$168"}]
+  "fields":[{"name":"0bitmap$170"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$184",
-  "fields":[{"name":"0bitmap$169"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$185",
+  "fields":[{"name":"0bitmap$175"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$186",
-  "fields":[{"name":"0bitmap$176"}]
+  "fields":[{"name":"0bitmap$174"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$187",
@@ -3746,33 +3894,29 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$188",
   "fields":[{"name":"0bitmap$173"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$189",
-  "fields":[{"name":"0bitmap$174"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$19",
   "fields":[{"name":"0bitmap$18"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$190",
-  "fields":[{"name":"0bitmap$175"}]
+  "fields":[{"name":"0bitmap$180"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$191",
-  "fields":[{"name":"0bitmap$180"}]
+  "fields":[{"name":"0bitmap$176"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$192",
-  "fields":[{"name":"0bitmap$179"}]
+  "fields":[{"name":"0bitmap$177"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$193",
-  "fields":[{"name":"0bitmap$194"}]
+  "fields":[{"name":"0bitmap$178"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$194",
-  "fields":[{"name":"0bitmap$193"}]
+  "fields":[{"name":"0bitmap$179"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$195",
@@ -3784,11 +3928,15 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$197",
-  "fields":[{"name":"0bitmap$181"}]
+  "fields":[{"name":"0bitmap$198"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$198",
-  "fields":[{"name":"0bitmap$182"}]
+  "fields":[{"name":"0bitmap$197"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$199",
+  "fields":[{"name":"0bitmap$188"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$2",
@@ -3800,7 +3948,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$200",
-  "fields":[{"name":"0bitmap$192"}]
+  "fields":[{"name":"0bitmap$187"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$201",
@@ -3810,13 +3958,9 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$202",
   "fields":[{"name":"0bitmap$186"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$203",
-  "fields":[{"name":"0bitmap$187"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$204",
-  "fields":[{"name":"0bitmap$188"}]
+  "fields":[{"name":"0bitmap$196"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$205",
@@ -3830,41 +3974,45 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$207",
   "fields":[{"name":"0bitmap$191"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$208",
+  "fields":[{"name":"0bitmap$192"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$209",
-  "fields":[{"name":"0bitmap$196"}]
+  "fields":[{"name":"0bitmap$193"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$21",
   "fields":[{"name":"0bitmap$19"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$211",
-  "fields":[{"name":"0bitmap$207"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$210",
+  "fields":[{"name":"0bitmap$194"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$212",
-  "fields":[{"name":"0bitmap$206"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$211",
+  "fields":[{"name":"0bitmap$195"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$213",
   "fields":[{"name":"0bitmap$200"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$214",
-  "fields":[{"name":"0bitmap$199"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$215",
-  "fields":[{"name":"0bitmap$197"}]
+  "fields":[{"name":"0bitmap$211"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$216",
-  "fields":[{"name":"0bitmap$198"}]
+  "fields":[{"name":"0bitmap$210"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$217",
+  "fields":[{"name":"0bitmap$204"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$218",
-  "fields":[{"name":"0bitmap$205"}]
+  "fields":[{"name":"0bitmap$203"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$219",
@@ -3878,41 +4026,37 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$220",
   "fields":[{"name":"0bitmap$202"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$221",
-  "fields":[{"name":"0bitmap$203"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$222",
-  "fields":[{"name":"0bitmap$204"}]
+  "fields":[{"name":"0bitmap$209"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$223",
-  "fields":[{"name":"0bitmap$209"}]
+  "fields":[{"name":"0bitmap$205"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$224",
-  "fields":[{"name":"0bitmap$208"}]
+  "fields":[{"name":"0bitmap$206"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$225",
-  "fields":[{"name":"0bitmap$246"}]
+  "fields":[{"name":"0bitmap$207"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$226",
-  "fields":[{"name":"0bitmap$245"}]
+  "fields":[{"name":"0bitmap$208"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$227",
-  "fields":[{"name":"0bitmap$220"}]
+  "fields":[{"name":"0bitmap$213"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$228",
-  "fields":[{"name":"0bitmap$214"}]
+  "fields":[{"name":"0bitmap$212"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$229",
-  "fields":[{"name":"0bitmap$210"}]
+  "fields":[{"name":"0bitmap$250"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$23",
@@ -3920,39 +4064,39 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$230",
-  "fields":[{"name":"0bitmap$211"}]
+  "fields":[{"name":"0bitmap$249"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$231",
-  "fields":[{"name":"0bitmap$212"}]
+  "fields":[{"name":"0bitmap$224"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$232",
-  "fields":[{"name":"0bitmap$213"}]
+  "fields":[{"name":"0bitmap$218"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$234",
-  "fields":[{"name":"0bitmap$219"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$233",
+  "fields":[{"name":"0bitmap$214"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$235",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$234",
   "fields":[{"name":"0bitmap$215"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$236",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$235",
   "fields":[{"name":"0bitmap$216"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$237",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$236",
   "fields":[{"name":"0bitmap$217"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$238",
-  "fields":[{"name":"0bitmap$218"}]
+  "fields":[{"name":"0bitmap$223"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$239",
-  "fields":[{"name":"0bitmap$244"}]
+  "fields":[{"name":"0bitmap$219"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$24",
@@ -3960,7 +4104,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$240",
-  "fields":[{"name":"0bitmap$224"}]
+  "fields":[{"name":"0bitmap$220"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$241",
@@ -3972,27 +4116,27 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$243",
-  "fields":[{"name":"0bitmap$223"}]
+  "fields":[{"name":"0bitmap$248"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$245",
-  "fields":[{"name":"0bitmap$238"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$244",
+  "fields":[{"name":"0bitmap$228"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$246",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$245",
   "fields":[{"name":"0bitmap$225"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$247",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$246",
   "fields":[{"name":"0bitmap$226"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$248",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$247",
   "fields":[{"name":"0bitmap$227"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$249",
-  "fields":[{"name":"0bitmap$228"}]
+  "fields":[{"name":"0bitmap$242"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$250",
@@ -4030,49 +4174,49 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$258",
   "fields":[{"name":"0bitmap$237"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$259",
+  "fields":[{"name":"0bitmap$238"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$26",
   "fields":[{"name":"0bitmap$25"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$260",
-  "fields":[{"name":"0bitmap$243"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$261",
   "fields":[{"name":"0bitmap$239"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$262",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$261",
   "fields":[{"name":"0bitmap$240"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$263",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$262",
   "fields":[{"name":"0bitmap$241"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$264",
-  "fields":[{"name":"0bitmap$242"}]
+  "fields":[{"name":"0bitmap$247"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$265",
-  "fields":[{"name":"0bitmap$248"}]
+  "fields":[{"name":"0bitmap$243"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$266",
-  "fields":[{"name":"0bitmap$247"}]
+  "fields":[{"name":"0bitmap$244"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$267",
-  "fields":[{"name":"0bitmap$250"}]
+  "fields":[{"name":"0bitmap$245"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$268",
-  "fields":[{"name":"0bitmap$249"}]
+  "fields":[{"name":"0bitmap$246"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$269",
-  "fields":[{"name":"0bitmap$257"}]
+  "fields":[{"name":"0bitmap$252"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$27",
@@ -4080,39 +4224,39 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$270",
-  "fields":[{"name":"0bitmap$256"}]
+  "fields":[{"name":"0bitmap$251"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$271",
-  "fields":[{"name":"0bitmap$255"}]
+  "fields":[{"name":"0bitmap$254"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$272",
-  "fields":[{"name":"0bitmap$251"}]
+  "fields":[{"name":"0bitmap$253"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$273",
-  "fields":[{"name":"0bitmap$252"}]
+  "fields":[{"name":"0bitmap$261"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$274",
-  "fields":[{"name":"0bitmap$253"}]
+  "fields":[{"name":"0bitmap$260"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$275",
-  "fields":[{"name":"0bitmap$254"}]
+  "fields":[{"name":"0bitmap$259"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$276",
-  "fields":[{"name":"0bitmap$270"}]
+  "fields":[{"name":"0bitmap$255"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$277",
-  "fields":[{"name":"0bitmap$269"}]
+  "fields":[{"name":"0bitmap$256"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$278",
-  "fields":[{"name":"0bitmap$260"}]
+  "fields":[{"name":"0bitmap$257"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$279",
@@ -4124,7 +4268,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$280",
-  "fields":[{"name":"0bitmap$259"}]
+  "fields":[{"name":"0bitmap$274"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$281",
+  "fields":[{"name":"0bitmap$273"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$282",
@@ -4132,63 +4280,59 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$283",
-  "fields":[{"name":"0bitmap$261"}]
+  "fields":[{"name":"0bitmap$262"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$284",
-  "fields":[{"name":"0bitmap$262"}]
+  "fields":[{"name":"0bitmap$263"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$285",
-  "fields":[{"name":"0bitmap$263"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$286",
+  "fields":[{"name":"0bitmap$268"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$287",
-  "fields":[{"name":"0bitmap$268"}]
+  "fields":[{"name":"0bitmap$265"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$288",
-  "fields":[{"name":"0bitmap$265"}]
+  "fields":[{"name":"0bitmap$266"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$289",
-  "fields":[{"name":"0bitmap$266"}]
+  "fields":[{"name":"0bitmap$267"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$29",
   "fields":[{"name":"0bitmap$26"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$290",
-  "fields":[{"name":"0bitmap$267"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$291",
+  "fields":[{"name":"0bitmap$272"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$292",
-  "fields":[{"name":"0bitmap$272"}]
+  "fields":[{"name":"0bitmap$269"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$293",
-  "fields":[{"name":"0bitmap$271"}]
+  "fields":[{"name":"0bitmap$270"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$295",
-  "fields":[{"name":"0bitmap$313"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$294",
+  "fields":[{"name":"0bitmap$271"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$296",
-  "fields":[{"name":"0bitmap$310"}]
+  "fields":[{"name":"0bitmap$276"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$297",
-  "fields":[{"name":"0bitmap$309"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$298",
-  "fields":[{"name":"0bitmap$284"}]
+  "fields":[{"name":"0bitmap$275"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$299",
-  "fields":[{"name":"0bitmap$278"}]
+  "fields":[{"name":"0bitmap$317"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$3",
@@ -4200,67 +4344,51 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$300",
-  "fields":[{"name":"0bitmap$274"}]
+  "fields":[{"name":"0bitmap$314"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$301",
-  "fields":[{"name":"0bitmap$275"}]
+  "fields":[{"name":"0bitmap$313"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$302",
-  "fields":[{"name":"0bitmap$276"}]
+  "fields":[{"name":"0bitmap$288"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$303",
-  "fields":[{"name":"0bitmap$277"}]
+  "fields":[{"name":"0bitmap$282"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$305",
-  "fields":[{"name":"0bitmap$283"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$304",
+  "fields":[{"name":"0bitmap$278"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$306",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$305",
   "fields":[{"name":"0bitmap$279"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$307",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$306",
   "fields":[{"name":"0bitmap$280"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$308",
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$307",
   "fields":[{"name":"0bitmap$281"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$309",
-  "fields":[{"name":"0bitmap$282"}]
+  "fields":[{"name":"0bitmap$287"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$31",
   "fields":[{"name":"0bitmap$28"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$310",
-  "fields":[{"name":"0bitmap$308"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$311",
-  "fields":[{"name":"0bitmap$288"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$316",
-  "fields":[{"name":"0bitmap$302"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$317",
-  "fields":[{"name":"0bitmap$289"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$318",
-  "fields":[{"name":"0bitmap$290"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$314",
+  "fields":[{"name":"0bitmap$312"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$319",
-  "fields":[{"name":"0bitmap$291"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$315",
+  "fields":[{"name":"0bitmap$292"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$32",
@@ -4268,7 +4396,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$320",
-  "fields":[{"name":"0bitmap$292"}]
+  "fields":[{"name":"0bitmap$306"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$321",
@@ -4310,21 +4438,25 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$33",
   "fields":[{"name":"0bitmap$30"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$330",
+  "fields":[{"name":"0bitmap$302"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$331",
-  "fields":[{"name":"0bitmap$307"}]
+  "fields":[{"name":"0bitmap$303"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$336",
-  "fields":[{"name":"0bitmap$312"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$332",
+  "fields":[{"name":"0bitmap$304"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$337",
-  "fields":[{"name":"0bitmap$311"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$333",
+  "fields":[{"name":"0bitmap$305"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$339",
-  "fields":[{"name":"0bitmap$323"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$335",
+  "fields":[{"name":"0bitmap$311"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$34",
@@ -4332,75 +4464,71 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$340",
-  "fields":[{"name":"0bitmap$315"}]
+  "fields":[{"name":"0bitmap$316"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$342",
-  "fields":[{"name":"0bitmap$322"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$341",
+  "fields":[{"name":"0bitmap$315"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$343",
-  "fields":[{"name":"0bitmap$321"}]
+  "fields":[{"name":"0bitmap$327"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$344",
-  "fields":[{"name":"0bitmap$320"}]
+  "fields":[{"name":"0bitmap$319"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$345",
-  "fields":[{"name":"0bitmap$317"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$346",
+  "fields":[{"name":"0bitmap$326"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$347",
-  "fields":[{"name":"0bitmap$319"}]
+  "fields":[{"name":"0bitmap$325"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$348",
-  "fields":[{"name":"0bitmap$318"}]
+  "fields":[{"name":"0bitmap$324"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$35",
-  "fields":[{"name":"0bitmap$36"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$349",
+  "fields":[{"name":"0bitmap$321"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$350",
-  "fields":[{"name":"0bitmap$351"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$35",
+  "fields":[{"name":"0bitmap$36"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$351",
-  "fields":[{"name":"0bitmap$328"}]
+  "fields":[{"name":"0bitmap$323"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$352",
-  "fields":[{"name":"0bitmap$327"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$353",
-  "fields":[{"name":"0bitmap$326"}]
+  "fields":[{"name":"0bitmap$322"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$354",
-  "fields":[{"name":"0bitmap$324"}]
+  "fields":[{"name":"0bitmap$355"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$355",
-  "fields":[{"name":"0bitmap$325"}]
+  "fields":[{"name":"0bitmap$332"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$356",
-  "fields":[{"name":"0bitmap$343"}]
+  "fields":[{"name":"0bitmap$331"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$357",
-  "fields":[{"name":"0bitmap$342"}]
+  "fields":[{"name":"0bitmap$330"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$358",
-  "fields":[{"name":"0bitmap$332"}]
+  "fields":[{"name":"0bitmap$328"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$359",
-  "fields":[{"name":"0bitmap$331"}]
+  "fields":[{"name":"0bitmap$329"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$36",
@@ -4408,19 +4536,19 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$360",
-  "fields":[{"name":"0bitmap$329"}]
+  "fields":[{"name":"0bitmap$347"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$361",
-  "fields":[{"name":"0bitmap$330"}]
+  "fields":[{"name":"0bitmap$346"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$362",
-  "fields":[{"name":"0bitmap$341"}]
+  "fields":[{"name":"0bitmap$336"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$363",
-  "fields":[{"name":"0bitmap$340"}]
+  "fields":[{"name":"0bitmap$335"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$364",
@@ -4432,11 +4560,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$366",
-  "fields":[{"name":"0bitmap$335"}]
+  "fields":[{"name":"0bitmap$345"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$367",
-  "fields":[{"name":"0bitmap$336"}]
+  "fields":[{"name":"0bitmap$344"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$368",
@@ -4454,37 +4582,53 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$370",
   "fields":[{"name":"0bitmap$339"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$371",
+  "fields":[{"name":"0bitmap$340"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$372",
-  "fields":[{"name":"0bitmap$345"}]
+  "fields":[{"name":"0bitmap$341"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$374",
-  "fields":[{"name":"0bitmap$348"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$373",
+  "fields":[{"name":"0bitmap$342"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$375",
-  "fields":[{"name":"0bitmap$347"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$374",
+  "fields":[{"name":"0bitmap$343"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$376",
-  "fields":[{"name":"0bitmap$346"}]
+  "fields":[{"name":"0bitmap$349"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$377",
-  "fields":[{"name":"0bitmap$350"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$378",
+  "fields":[{"name":"0bitmap$352"}]
 },
 {
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$378",
-  "fields":[{"name":"0bitmap$349"}]
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$379",
+  "fields":[{"name":"0bitmap$351"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$38",
   "fields":[{"name":"0bitmap$33"}]
 },
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$380",
+  "fields":[{"name":"0bitmap$350"}]
+},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$381",
-  "fields":[{"name":"0bitmap$352"}]
+  "fields":[{"name":"0bitmap$354"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$382",
+  "fields":[{"name":"0bitmap$353"}]
+},
+{
+  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$385",
+  "fields":[{"name":"0bitmap$356"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$39",
@@ -4672,7 +4816,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$84",
-  "fields":[{"name":"0bitmap$109"}]
+  "fields":[{"name":"0bitmap$111"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$85",
diff --git a/compiler/lib/src/main/scala/ast/Ast.scala b/compiler/lib/src/main/scala/ast/Ast.scala
index 79eba76ee..e932409ac 100644
--- a/compiler/lib/src/main/scala/ast/Ast.scala
+++ b/compiler/lib/src/main/scala/ast/Ast.scala
@@ -191,6 +191,7 @@ object Ast {
     final case class DefSignal(node: AstNode[Ast.DefSignal]) extends Node
     final case class DefState(node: AstNode[Ast.DefState]) extends Node
     final case class SpecInitialTransition(node: AstNode[Ast.SpecInitialTransition]) extends Node
+    final case class SpecInclude(node: AstNode[Ast.SpecInclude]) extends Node
   }
 
   /** Action definition */
@@ -241,6 +242,7 @@ object Ast {
     final case class SpecStateEntry(node: AstNode[Ast.SpecStateEntry]) extends Node
     final case class SpecStateExit(node: AstNode[Ast.SpecStateExit]) extends Node
     final case class SpecStateTransition(node: AstNode[Ast.SpecStateTransition]) extends Node
+    final case class SpecInclude(node: AstNode[Ast.SpecInclude]) extends Node
   }
 
   /** Initial state specifier */
diff --git a/compiler/lib/src/main/scala/ast/AstTransformer.scala b/compiler/lib/src/main/scala/ast/AstTransformer.scala
index 53ef45d52..7de3ba2ed 100644
--- a/compiler/lib/src/main/scala/ast/AstTransformer.scala
+++ b/compiler/lib/src/main/scala/ast/AstTransformer.scala
@@ -68,6 +68,60 @@ trait AstTransformer {
     node: Ast.Annotated[AstNode[Ast.DefStateMachine]]
   ): ResultAnnotatedNode[Ast.DefStateMachine] = Right(default(in), node)
 
+  def defActionAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.DefAction]]
+  ): ResultAnnotatedNode[Ast.DefAction] =
+    Right(default(in), node)
+
+  def defChoiceAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.DefChoice]]
+  ): ResultAnnotatedNode[Ast.DefChoice] =
+    Right(default(in), node)
+
+  def defGuardAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.DefGuard]]
+  ): ResultAnnotatedNode[Ast.DefGuard] =
+    Right(default(in), node)
+
+  def defSignalAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.DefSignal]]
+  ): ResultAnnotatedNode[Ast.DefSignal] =
+    Right(default(in), node)
+
+  def defStateAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.DefState]]
+  ): ResultAnnotatedNode[Ast.DefState] =
+    Right(default(in), node)
+
+  def specInitialTransitionAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.SpecInitialTransition]]
+  ): ResultAnnotatedNode[Ast.SpecInitialTransition] =
+    Right(default(in), node)
+
+  def specStateEntryAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.SpecStateEntry]]
+  ): ResultAnnotatedNode[Ast.SpecStateEntry] =
+    Right(default(in), node)
+
+  def specStateExitAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.SpecStateExit]]
+  ): ResultAnnotatedNode[Ast.SpecStateExit] =
+    Right(default(in), node)
+
+  def specStateTransitionAnnotatedNode(
+    in: In,
+    node: Ast.Annotated[AstNode[Ast.SpecStateTransition]]
+  ): ResultAnnotatedNode[Ast.SpecStateTransition] =
+    Right(default(in), node)
+
   def defStructAnnotatedNode(
     in: In,
     node: Ast.Annotated[AstNode[Ast.DefStruct]]
@@ -315,6 +369,76 @@ trait AstTransformer {
       case e : Ast.ExprUnop => exprUnopNode(in, node, e)
     }
 
+  final def matchStateMember(in: In, member: Ast.StateMember): Result[Ast.StateMember] = {
+    def transform[T](
+      result: ResultAnnotatedNode[T],
+      f: AstNode[T] => Ast.StateMember.Node
+    ) = {
+      for { pair <- result } yield {
+        val (out, (pre, node, post)) = pair
+        (out, Ast.StateMember(pre, f(node), post))
+      }
+    }
+    val (pre, node, post) =  member.node
+    node match {
+      case Ast.StateMember.DefChoice(node1) =>
+        transform(defChoiceAnnotatedNode(in, (pre, node1, post)), Ast.StateMember.DefChoice(_))
+      case Ast.StateMember.DefState(node1) =>
+        transform(defStateAnnotatedNode(in, (pre, node1, post)), Ast.StateMember.DefState(_))
+      case Ast.StateMember.SpecInitialTransition(node1) =>
+        transform(specInitialTransitionAnnotatedNode(in, (pre, node1, post)), Ast.StateMember.SpecInitialTransition(_))
+      case Ast.StateMember.SpecStateEntry(node1) =>
+        transform(specStateEntryAnnotatedNode(in, (pre, node1, post)), Ast.StateMember.SpecStateEntry(_))
+      case Ast.StateMember.SpecStateExit(node1) =>
+        transform(specStateExitAnnotatedNode(in, (pre, node1, post)), Ast.StateMember.SpecStateExit(_))
+      case Ast.StateMember.SpecStateTransition(node1) =>
+        transform(specStateTransitionAnnotatedNode(in, (pre, node1, post)), Ast.StateMember.SpecStateTransition(_))
+      case Ast.StateMember.SpecInclude(node1) =>
+        transform(specIncludeAnnotatedNode(in, (pre, node1, post)), Ast.StateMember.SpecInclude(_))
+    }
+  }
+
+  final def matchStateMachineMember(in: In, member: Ast.StateMachineMember): Result[Ast.StateMachineMember] = {
+    def transform[T](
+      result: ResultAnnotatedNode[T],
+      f: AstNode[T] => Ast.StateMachineMember.Node
+    ) = {
+      for { pair <- result } yield {
+        val (out, (pre, node, post)) = pair
+        (out, Ast.StateMachineMember(pre, f(node), post))
+      }
+    }
+    val (pre, node, post) =  member.node
+    node match {
+      case Ast.StateMachineMember.DefAbsType(node1) =>
+        transform(defAbsTypeAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefAbsType(_))
+      case Ast.StateMachineMember.DefAliasType(node1) =>
+        transform(defAliasTypeAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefAliasType(_))
+      case Ast.StateMachineMember.DefArray(node1) =>
+        transform(defArrayAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefArray(_))
+      case Ast.StateMachineMember.DefConstant(node1) =>
+        transform(defConstantAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefConstant(_))
+      case Ast.StateMachineMember.DefEnum(node1) =>
+        transform(defEnumAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefEnum(_))
+      case Ast.StateMachineMember.DefStruct(node1) =>
+        transform(defStructAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefStruct(_))
+      case Ast.StateMachineMember.DefAction(node1) =>
+        transform(defActionAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefAction(_))
+      case Ast.StateMachineMember.DefChoice(node1) =>
+        transform(defChoiceAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefChoice(_))
+      case Ast.StateMachineMember.DefGuard(node1) =>
+        transform(defGuardAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefGuard(_))
+      case Ast.StateMachineMember.DefSignal(node1) =>
+        transform(defSignalAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefSignal(_))
+      case Ast.StateMachineMember.DefState(node1) =>
+        transform(defStateAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.DefState(_))
+      case Ast.StateMachineMember.SpecInitialTransition(node1) =>
+        transform(specInitialTransitionAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.SpecInitialTransition(_))
+      case Ast.StateMachineMember.SpecInclude(node1) =>
+        transform(specIncludeAnnotatedNode(in, (pre, node1, post)), Ast.StateMachineMember.SpecInclude(_))
+    }
+  }
+
   final def matchModuleMember(in: In, member: Ast.ModuleMember): Result[Ast.ModuleMember] = {
     def transform[T](
       result: ResultAnnotatedNode[T],
diff --git a/compiler/lib/src/main/scala/ast/AstVisitor.scala b/compiler/lib/src/main/scala/ast/AstVisitor.scala
index 4b3d31ae7..ecf292449 100644
--- a/compiler/lib/src/main/scala/ast/AstVisitor.scala
+++ b/compiler/lib/src/main/scala/ast/AstVisitor.scala
@@ -227,6 +227,7 @@ trait AstVisitor {
       case Ast.StateMachineMember.DefState(node1) => defStateAnnotatedNode(in, (pre, node1, post))
       case Ast.StateMachineMember.DefStruct(node1) => defStructAnnotatedNode(in, (pre, node1, post))
       case Ast.StateMachineMember.SpecInitialTransition(node1) => specInitialTransitionAnnotatedNode(in, (pre, node1, post))
+      case Ast.StateMachineMember.SpecInclude(node1) => specIncludeAnnotatedNode(in, (pre, node1, post))
     }
   }
 
@@ -236,6 +237,7 @@ trait AstVisitor {
       case Ast.StateMember.DefChoice(node1) => defChoiceAnnotatedNode(in, (pre, node1, post))
       case Ast.StateMember.DefState(node1) => defStateAnnotatedNode(in, (pre, node1, post))
       case Ast.StateMember.SpecInitialTransition(node1) => specInitialTransitionAnnotatedNode(in, (pre, node1, post))
+      case Ast.StateMember.SpecInclude(node1) => specIncludeAnnotatedNode(in, (pre, node1, post))
       case Ast.StateMember.SpecStateEntry(node1) => specStateEntryAnnotatedNode(in, (pre, node1, post))
       case Ast.StateMember.SpecStateExit(node1) => specStateExitAnnotatedNode(in, (pre, node1, post))
       case Ast.StateMember.SpecStateTransition(node1) => specStateTransitionAnnotatedNode(in, (pre, node1, post))
diff --git a/compiler/lib/src/main/scala/syntax/Parser.scala b/compiler/lib/src/main/scala/syntax/Parser.scala
index e79f5d016..9d60d5c1e 100644
--- a/compiler/lib/src/main/scala/syntax/Parser.scala
+++ b/compiler/lib/src/main/scala/syntax/Parser.scala
@@ -888,11 +888,12 @@ object Parser extends Parsers {
     node(defSignal) ^^ (n => Ast.StateMachineMember.DefSignal(n)) |
     node(defState) ^^ (n => Ast.StateMachineMember.DefState(n)) |
     node(defStruct) ^^ (n => Ast.StateMachineMember.DefStruct(n)) |
+    node(specInclude) ^^ (n => Ast.StateMachineMember.SpecInclude(n)) |
     node(specInitialTransition) ^^ (n => Ast.StateMachineMember.SpecInitialTransition(n)) |
     failure("state machine member expected")
   }
 
-  private def stateMachineMembers: Parser[List[Ast.StateMachineMember]] =
+  def stateMachineMembers: Parser[List[Ast.StateMachineMember]] =
     annotatedElementSequence(
       stateMachineMemberNode,
       semi,
@@ -900,18 +901,19 @@ object Parser extends Parsers {
     )
 
   private def stateMemberNode: Parser[Ast.StateMember.Node] = {
-    node(defChoice) ^^ (n => Ast.StateMember.DefChoice(n)) |
+      node(defChoice) ^^ (n => Ast.StateMember.DefChoice(n)) |
       node(defState) ^^ (n => Ast.StateMember.DefState(n)) |
       node(specInitialTransition) ^^ (n =>
         Ast.StateMember.SpecInitialTransition(n)) |
       node(specStateEntry) ^^ (n => Ast.StateMember.SpecStateEntry(n)) |
       node(specStateExit) ^^ (n => Ast.StateMember.SpecStateExit(n)) |
+      node(specInclude) ^^ (n => Ast.StateMember.SpecInclude(n)) |
       node(specStateTransition) ^^ (n =>
         Ast.StateMember.SpecStateTransition(n)) |
       failure("state member expected")
   }
 
-  private def stateMembers: Parser[List[Ast.StateMember]] =
+  def stateMembers: Parser[List[Ast.StateMember]] =
     annotatedElementSequence(stateMemberNode, semi, Ast.StateMember(_))
 
   def structTypeMember: Parser[Ast.StructTypeMember] = {
diff --git a/compiler/lib/src/main/scala/transform/ResolveSpecInclude.scala b/compiler/lib/src/main/scala/transform/ResolveSpecInclude.scala
index 35c96202d..11f23446d 100644
--- a/compiler/lib/src/main/scala/transform/ResolveSpecInclude.scala
+++ b/compiler/lib/src/main/scala/transform/ResolveSpecInclude.scala
@@ -42,6 +42,41 @@ object ResolveSpecInclude extends AstStateTransformer {
     }
   }
 
+  override def defStateMachineAnnotatedNode(
+    a: Analysis,
+    node: Ast.Annotated[AstNode[Ast.DefStateMachine]]
+  ) = {
+    val (pre, node1, post) = node
+    val Ast.DefStateMachine(name, members) = node1.data
+    members match {
+      case None => Right((a, node))
+      case Some(members) => {
+        for { result <- transformList(a, members, stateMachineMember) }
+        yield {
+          val (a1, members1) = result
+          val defStateMachine = Ast.DefStateMachine(name, Some(members1.flatten))
+          val node2 = AstNode.create(defStateMachine, node1.id)
+          (a1, (pre, node2, post))
+        }
+      }
+    }
+  }
+
+  override def defStateAnnotatedNode(
+    a: Analysis,
+    node: Ast.Annotated[AstNode[Ast.DefState]]
+  ) = {
+    val (pre, node1, post) = node
+    val Ast.DefState(name, members) = node1.data
+    for { result <- transformList(a, members, stateMember) }
+    yield {
+      val (a1, members1) = result
+      val defStateMachine = Ast.DefState(name, members1.flatten)
+      val node2 = AstNode.create(defStateMachine, node1.id)
+      (a1, (pre, node2, post))
+    }
+  }
+
   override def defTopologyAnnotatedNode(
     a: Analysis,
     node: Ast.Annotated[AstNode[Ast.DefTopology]]
@@ -207,6 +242,34 @@ object ResolveSpecInclude extends AstStateTransformer {
     }
   }
 
+  private def stateMember(a: Analysis, member: Ast.StateMember): Result[List[Ast.StateMember]] = {
+    val (_, node, _) = member.node
+    node match {
+      case Ast.StateMember.SpecInclude(node1) => resolveSpecInclude(
+        a,
+        node1,
+        Parser.stateMembers,
+        stateMember
+      )
+      case _ => for { result <- matchStateMember(a, member) }
+        yield (result._1, List(result._2))
+    }
+  }
+
+  private def stateMachineMember(a: Analysis, member: Ast.StateMachineMember): Result[List[Ast.StateMachineMember]] = {
+    val (_, node, _) = member.node
+    node match {
+      case Ast.StateMachineMember.SpecInclude(node1) => resolveSpecInclude(
+        a,
+        node1,
+        Parser.stateMachineMembers,
+        stateMachineMember
+      )
+      case _ => for { result <- matchStateMachineMember(a, member) }
+        yield (result._1, List(result._2))
+    }
+  }
+
   private def tuMember(a: Analysis, tum: Ast.TUMember) = moduleMember(a, tum)
 
 }
diff --git a/compiler/tools/fpp-syntax/test/include-state-machine.fpp b/compiler/tools/fpp-syntax/test/include-state-machine.fpp
new file mode 100644
index 000000000..987b29b2a
--- /dev/null
+++ b/compiler/tools/fpp-syntax/test/include-state-machine.fpp
@@ -0,0 +1,12 @@
+state machine M {@ Action a1
+  action a1
+
+  @ Action a2
+  action a2
+
+  include "subdir/state.fppi"
+
+  state S2 {
+    include "subdir/state.fppi"
+  }
+}
diff --git a/compiler/tools/fpp-syntax/test/include-state-machine.ref.txt b/compiler/tools/fpp-syntax/test/include-state-machine.ref.txt
new file mode 100644
index 000000000..5f66b6743
--- /dev/null
+++ b/compiler/tools/fpp-syntax/test/include-state-machine.ref.txt
@@ -0,0 +1,56 @@
+def state machine
+  ident M
+  @ Action a1
+  def action
+    ident a1
+  @ Action a2
+  def action
+    ident a2
+  def state
+    ident S1
+    spec state entry
+      action ident a1
+      action ident a2
+    spec state exit
+      action ident a1
+      action ident a2
+    @ Initial transition
+    spec initial
+      action ident a1
+      action ident a2
+      target qual ident S3
+    @ Choice C
+    def choice
+      ident C
+      guard ident g1
+      action ident a1
+      action ident a2
+      target qual ident S1
+      action ident a2
+      action ident a3
+      target qual ident S2.S3
+  def state
+    ident S2
+    def state
+      ident S1
+      spec state entry
+        action ident a1
+        action ident a2
+      spec state exit
+        action ident a1
+        action ident a2
+      @ Initial transition
+      spec initial
+        action ident a1
+        action ident a2
+        target qual ident S3
+      @ Choice C
+      def choice
+        ident C
+        guard ident g1
+        action ident a1
+        action ident a2
+        target qual ident S1
+        action ident a2
+        action ident a3
+        target qual ident S2.S3
diff --git a/compiler/tools/fpp-syntax/test/run b/compiler/tools/fpp-syntax/test/run
index d05b6a688..fdfd76db5 100755
--- a/compiler/tools/fpp-syntax/test/run
+++ b/compiler/tools/fpp-syntax/test/run
@@ -88,6 +88,11 @@ include_subdir()
   run_test -ia include-subdir
 }
 
+include_state_machine()
+{
+  run_test -ia include-state-machine
+}
+
 include_topology()
 {
   run_test -ia include-topology
diff --git a/compiler/tools/fpp-syntax/test/subdir/state.fppi b/compiler/tools/fpp-syntax/test/subdir/state.fppi
new file mode 100644
index 000000000..0d92d7c07
--- /dev/null
+++ b/compiler/tools/fpp-syntax/test/subdir/state.fppi
@@ -0,0 +1,10 @@
+state S1 {
+    entry do { a1, a2 }
+    exit do { a1, a2 }
+
+    @ Initial transition
+    initial do { a1, a2 } enter S3
+
+    @ Choice C
+    choice C { if g1 do { a1, a2 } enter S1 else do { a2, a3 } enter S2.S3 }
+}
diff --git a/compiler/tools/fpp-syntax/test/update-ref b/compiler/tools/fpp-syntax/test/update-ref
index b39447258..4f7d7f37e 100755
--- a/compiler/tools/fpp-syntax/test/update-ref
+++ b/compiler/tools/fpp-syntax/test/update-ref
@@ -42,6 +42,7 @@ update -ia include-component
 update -ia include-constant-1 include-constant-1
 update -ia include-module
 update -ia include-subdir
+update -ia include-state-machine
 update -ia include-topology
 update -ia subdir/include-parent-dir
 update -ia syntax syntax-include-ast
diff --git a/docs/fpp-spec.html b/docs/fpp-spec.html
index 2bc7ed7e8..34149d06a 100644
--- a/docs/fpp-spec.html
+++ b/docs/fpp-spec.html
@@ -4,7 +4,7 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.23">
+<meta name="generator" content="Asciidoctor 2.0.26">
 <title>The F Prime Prime (FPP) Language Specification, v3.1.0</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
 <style>
@@ -116,7 +116,6 @@
 :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
-pre>code{display:block}
 pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
 em em{font-style:normal}
 strong strong{font-weight:400}
@@ -219,6 +218,7 @@
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
 .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
 .listingblock>.content{position:relative}
+.listingblock pre>code{display:block}
 .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
 .listingblock:hover code[data-lang]::before{display:block}
 .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
@@ -3119,6 +3119,9 @@ <h4 id="Definitions_State-Machine-Definitions_Syntax">5.12.1. Syntax</h4>
 <p>A <a href="#Definitions_Constant-Definitions">constant definition</a></p>
 </li>
 <li>
+<p>An <a href="#Specifiers_Include-Specifiers">include specifier</a></p>
+</li>
+<li>
 <p>A <a href="#Definitions_Struct-Definitions">struct definition</a></p>
 </li>
 <li>
@@ -5023,6 +5026,9 @@ <h4 id="State-Machine-Behavior-Elements_State-Definitions_Syntax">6.7.1. Syntax<
 <p>An <a href="#State-Machine-Behavior-Elements_Initial-Transition-Specifiers">initial transition specifier</a></p>
 </li>
 <li>
+<p>An <a href="#Specifiers_Include-Specifiers">include specifier</a></p>
+</li>
+<li>
 <p>A <a href="#State-Machine-Behavior-Elements_Choice-Definitions">choice definition</a></p>
 </li>
 <li>
@@ -12152,7 +12158,7 @@ <h3 id="Analysis-and-Translation_Translation-Tools">22.4. Translation Tools</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2026-01-27 18:03:31 -0800
+Last updated 2026-01-28 17:06:01 -0800
 </div>
 </div>
 <script src="code-prettify/run_prettify.js"></script>
@@ -12179,6 +12185,6 @@ <h3 id="Analysis-and-Translation_Translation-Tools">22.4. Translation Tools</h3>
   })
 })
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_CHTML"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/fpp-users-guide.html b/docs/fpp-users-guide.html
index fc5f9c61b..7f2da6bd4 100644
--- a/docs/fpp-users-guide.html
+++ b/docs/fpp-users-guide.html
@@ -4,7 +4,7 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.23">
+<meta name="generator" content="Asciidoctor 2.0.26">
 <title>The F Prime Prime (FPP) User&#8217;s Guide, v3.1.0</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
 <style>
@@ -116,7 +116,6 @@
 :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
-pre>code{display:block}
 pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
 em em{font-style:normal}
 strong strong{font-weight:400}
@@ -219,6 +218,7 @@
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
 .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
 .listingblock>.content{position:relative}
+.listingblock pre>code{display:block}
 .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
 .listingblock:hover code[data-lang]::before{display:block}
 .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
@@ -555,6 +555,7 @@ <h1>The F Prime Prime (FPP) User&#8217;s Guide, v3.1.0</h1>
 </ul>
 </li>
 <li><a href="#Defining-State-Machines_Constants-Types-and-Enums">10.7. Constants, Types, and Enums</a></li>
+<li><a href="#Defining-State-Machines_Include-Specifiers">10.8. Include Specifiers</a></li>
 </ul>
 </li>
 <li><a href="#Defining-Components">11. Defining Components</a>
@@ -6159,6 +6160,42 @@ <h3 id="Defining-State-Machines_Constants-Types-and-Enums">10.7. Constants, Type
 <a href="#Analyzing-and-Translating-Models_Generating-C-Plus-Plus">generating C&#43;&#43;</a>.</p>
 </div>
 </div>
+<div class="sect2">
+<h3 id="Defining-State-Machines_Include-Specifiers">10.8. Include Specifiers</h3>
+<div class="paragraph">
+<p>State machines definitions, like component definitions, can become long and
+repetitive. Portions of state machine definitions can be broken up into different
+files and included back into the main state machine definition.</p>
+</div>
+<div class="paragraph">
+<p>For example, suppose you are defining a state machine with a large substate
+and you wish to split it out into a separate file <code>LargeState.fppi</code>.
+The suffix <code>.fppi</code> is conventional for included FPP files.
+Inside the state machine definition, you can write the
+following state machine member:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code data-lang="fpp">include "LargeState.fppi"</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This construct is called an <strong>include specifier</strong>.
+During analysis and translation, the include specifier
+is replaced with the state specified
+in <code>LargeState.fppi</code>, just as if you had written them
+at the point where you wrote the include specifier.
+This replacement is called expanding or resolving the
+include specifier.
+This technique can be used in the top level of the state machine
+as well as within a sub-state as a state member rather than a member
+of the overall state machine.</p>
+</div>
+<div class="paragraph">
+<p>We discuss include specifiers further in the section on
+<a href="#Specifying-Models-as-Files_Include-Specifiers">specifying models as files</a>.</p>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -16378,7 +16415,7 @@ <h3 id="Writing-C-Plus-Plus-Implementations_Serialization-of-FPP-Values">17.4. S
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2026-01-27 17:11:08 -0800
+Last updated 2026-01-28 21:57:48 -0800
 </div>
 </div>
 <script src="code-prettify/run_prettify.js"></script>
@@ -16405,6 +16442,6 @@ <h3 id="Writing-C-Plus-Plus-Implementations_Serialization-of-FPP-Values">17.4. S
   })
 })
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_CHTML"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
index 41ba698fb..41bc390e9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -464,7 +464,7 @@ <h1>F Prime Prime (FPP)</h1>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 13:29:20 -0800
+Last updated 2025-01-28 17:09:18 -0800
 </div>
 </div>
 </body>
diff --git a/docs/spec/Definitions/State-Machine-Definitions.adoc b/docs/spec/Definitions/State-Machine-Definitions.adoc
index e209e53de..3a91323ae 100644
--- a/docs/spec/Definitions/State-Machine-Definitions.adoc
+++ b/docs/spec/Definitions/State-Machine-Definitions.adoc
@@ -25,6 +25,7 @@ and the terminating punctuation is a semicolon.
 A state machine member is one of the following:
 
 * A <<Definitions_Constant-Definitions,constant definition>>
+* An <<Specifiers_Include-Specifiers,include specifier>>
 * A <<Definitions_Struct-Definitions,struct definition>>
 * A <<State-Machine-Behavior-Elements_Choice-Definitions,choice definition>>
 * A <<State-Machine-Behavior-Elements_Guard-Definitions,guard definition>>
diff --git a/docs/spec/State-Machine-Behavior-Elements/State-Definitions.adoc b/docs/spec/State-Machine-Behavior-Elements/State-Definitions.adoc
index a8c82a09d..c699fa018 100644
--- a/docs/spec/State-Machine-Behavior-Elements/State-Definitions.adoc
+++ b/docs/spec/State-Machine-Behavior-Elements/State-Definitions.adoc
@@ -20,6 +20,7 @@ and the terminating punctuation is a semicolon.
 A state definition member is one of the following:
 
 * An <<State-Machine-Behavior-Elements_Initial-Transition-Specifiers,initial transition specifier>>
+* An <<Specifiers_Include-Specifiers,include specifier>>
 * A <<State-Machine-Behavior-Elements_Choice-Definitions,choice definition>>
 * A <<State-Machine-Behavior-Elements_State-Definitions,state definition>>
 * A <<State-Machine-Behavior-Elements_State-Transition-Specifiers,state transition specifier>>
diff --git a/docs/users-guide/Defining-State-Machines.adoc b/docs/users-guide/Defining-State-Machines.adoc
index 383f12423..1d21d471d 100644
--- a/docs/users-guide/Defining-State-Machines.adoc
+++ b/docs/users-guide/Defining-State-Machines.adoc
@@ -1887,3 +1887,35 @@ Similarly, the FPP constant `M.c` becomes a {cpp} constant `M_c`.
 We will have more to say about this issue in the section on
 <<Analyzing-and-Translating-Models_Generating-C-Plus-Plus,
 generating {cpp}>>.
+
+=== Include Specifiers
+
+State machines definitions, like component definitions, can become long and
+repetitive. Portions of state machine definitions can be broken up into different
+files and included back into the main state machine definition.
+
+For example, suppose you are defining a state machine with a large substate
+and you wish to split it out into a separate file `LargeState.fppi`.
+The suffix `.fppi` is conventional for included FPP files.
+Inside the state machine definition, you can write the
+following state machine member:
+
+[source,fpp]
+--------
+include "LargeState.fppi"
+--------
+
+This construct is called an *include specifier*.
+During analysis and translation, the include specifier
+is replaced with the state specified
+in `LargeState.fppi`, just as if you had written them
+at the point where you wrote the include specifier.
+This replacement is called expanding or resolving the
+include specifier.
+This technique can be used in the top level of the state machine
+as well as within a sub-state as a state member rather than a member
+of the overall state machine.
+
+We discuss include specifiers further in the section on
+<<Specifying-Models-as-Files_Include-Specifiers,
+specifying models as files>>.