From e86ec423c2f0b2d76f416a4476d2824de437e7a2 Mon Sep 17 00:00:00 2001
From: Casey Warrington <spacechase0.and.cat@gmail.com>
Date: Sun, 17 Aug 2025 01:26:28 -0400
Subject: [PATCH] Initial draft of update for Flecs 4.1.0. New features are
 untested (though some, like the script builder functions, might see testing
 by me soon).

What I didn't do:
* Docs for things I added
* New tests/examples (such as with the new function stuff for the script builder)
* Unsure if relevant, breaking change to match a C++-specific change (entity::get returns ref, new try_get): https://github.com/SanderMertens/flecs/discussions/466#discussioncomment-13438915
* Unsure if relevant, breaking change to match a C++-specific change (entity::get_constant added to make up for get having changed(?)): https://github.com/SanderMertens/flecs/discussions/466#discussioncomment-13438960
* Unsure if relevant, new API function to match a C++-specific one (entity::assign)
* A bunch of safety checks in the script function/method/constant stuff (and a not-janky implementation of them in general)
* Anything that is new in the full changelog, but not in the release announcement's highlights

Breaking change made by me specifically to the C# binding:
* When registering a prefab associated with a C# type (such as `world.Prefab<SomeStruct>()`), the prefab can no longer have any fields.
 * This was causing problems in native flecs: `fatal: sparse_storage.c: 124: assert: tgt != 0 INTERNAL_ERROR`
 * Something to do with relationships being sparse/nonfragmenting now I think? (There's a good chance I'm wrong on that though)
 * This behavior could probably be restored, maybe by making the C# type correspond to a component, but the Prefab<>(...) call makes a prefab with a separate id that always includes the component (using the World.SetWith functionality, possibly)? But I didn't feel like doing the refactoring for that.

I was having some issues with committing line endings for the generated files.
Hopefully I only included the ones that actually got functional changes? I'd like to suggest having the generated files not included in the repository and just making it generate as part of the build process (maybe with source generators if the current implementation is hard to fit in correctly).
---
 native/flecs                                  |    2 +-
 native/flecs_helpers.c                        | 1208 +--
 .../Flecs.NET.Bindgen.csproj                  |   70 +-
 src/Flecs.NET.Bindgen/Program.cs              |  102 +-
 src/Flecs.NET.Bindgen/bootstrap.h             |    3 +
 src/Flecs.NET.Bindings/Flecs.g.cs             | 1214 ++-
 .../Generators/QueryBuilder.cs                | 2318 ++--
 .../Queries/ChangeTracking.cs                 |  281 +-
 src/Flecs.NET.Examples/Relationships/Union.cs |   81 -
 src/Flecs.NET.Native/build.zig                |  533 +-
 .../CSharp/Core/ExampleTests.cs               | 1068 +-
 src/Flecs.NET.Tests/Cpp/EntityTests.cs        | 9514 ++++++++---------
 src/Flecs.NET.Tests/Cpp/QueryTests.cs         | 7128 ++++++------
 src/Flecs.NET.Tests/Cpp/UnionTests.cs         |  143 -
 .../Core/BindingContext/Functions.cs          | 2148 ++--
 .../Core/BindingContext/OsApiContext.cs       |   64 +-
 src/Flecs.NET/Core/Ecs/Aliases.cs             | 1325 ++-
 src/Flecs.NET/Core/Ecs/Delegates.cs           |  334 +-
 src/Flecs.NET/Core/Ecs/OsApi.cs               |  222 +-
 src/Flecs.NET/Core/Entity.cs                  | 7380 ++++++-------
 src/Flecs.NET/Core/IQueryBuilder.cs           |  924 +-
 src/Flecs.NET/Core/Iter.cs                    | 1743 +--
 src/Flecs.NET/Core/IterIterable.cs            |  895 +-
 src/Flecs.NET/Core/QueryBuilder.cs            | 3924 +++----
 src/Flecs.NET/Core/Type.cs                    | 1596 +--
 src/Flecs.NET/Core/World.cs                   | 8790 +++++++--------
 .../AlertBuilder.QueryBuilder.g.cs            | 2108 ++--
 .../ObserverBuilder.QueryBuilder.g.cs         | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T1.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T10.g.cs     | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T11.g.cs     | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T12.g.cs     | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T13.g.cs     | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T14.g.cs     | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T15.g.cs     | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T16.g.cs     | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T2.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T3.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T4.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T5.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T6.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T7.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T8.g.cs      | 2108 ++--
 .../ObserverBuilder.QueryBuilder/T9.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder.g.cs         | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T1.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T10.g.cs     | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T11.g.cs     | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T12.g.cs     | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T13.g.cs     | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T14.g.cs     | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T15.g.cs     | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T16.g.cs     | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T2.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T3.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T4.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T5.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T6.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T7.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T8.g.cs      | 2108 ++--
 .../PipelineBuilder.QueryBuilder/T9.g.cs      | 2108 ++--
 .../QueryBuilder.QueryBuilder/T1.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T10.g.cs        | 2108 ++--
 .../QueryBuilder.QueryBuilder/T11.g.cs        | 2108 ++--
 .../QueryBuilder.QueryBuilder/T12.g.cs        | 2108 ++--
 .../QueryBuilder.QueryBuilder/T13.g.cs        | 2108 ++--
 .../QueryBuilder.QueryBuilder/T14.g.cs        | 2108 ++--
 .../QueryBuilder.QueryBuilder/T15.g.cs        | 2108 ++--
 .../QueryBuilder.QueryBuilder/T16.g.cs        | 2108 ++--
 .../QueryBuilder.QueryBuilder/T2.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T3.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T4.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T5.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T6.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T7.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T8.g.cs         | 2108 ++--
 .../QueryBuilder.QueryBuilder/T9.g.cs         | 2108 ++--
 .../SystemBuilder.QueryBuilder.g.cs           | 2108 ++--
 .../SystemBuilder.QueryBuilder/T1.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T10.g.cs       | 2108 ++--
 .../SystemBuilder.QueryBuilder/T11.g.cs       | 2108 ++--
 .../SystemBuilder.QueryBuilder/T12.g.cs       | 2108 ++--
 .../SystemBuilder.QueryBuilder/T13.g.cs       | 2108 ++--
 .../SystemBuilder.QueryBuilder/T14.g.cs       | 2108 ++--
 .../SystemBuilder.QueryBuilder/T15.g.cs       | 2108 ++--
 .../SystemBuilder.QueryBuilder/T16.g.cs       | 2108 ++--
 .../SystemBuilder.QueryBuilder/T2.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T3.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T4.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T5.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T6.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T7.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T8.g.cs        | 2108 ++--
 .../SystemBuilder.QueryBuilder/T9.g.cs        | 2108 ++--
 src/Flecs.NET/Utilities/Managed.cs            |  184 +-
 95 files changed, 98520 insertions(+), 98018 deletions(-)
 create mode 100644 src/Flecs.NET.Bindgen/bootstrap.h
 delete mode 100644 src/Flecs.NET.Examples/Relationships/Union.cs
 delete mode 100644 src/Flecs.NET.Tests/Cpp/UnionTests.cs

diff --git a/native/flecs b/native/flecs
index fa9d3557..9e06477d 160000
--- a/native/flecs
+++ b/native/flecs
@@ -1 +1 @@
-Subproject commit fa9d355760c109c7bfea5b19da5a288eb3acf027
+Subproject commit 9e06477db0fdf9317bf583ff4b1318622283165f
diff --git a/native/flecs_helpers.c b/native/flecs_helpers.c
index 80c02a41..996a98cb 100644
--- a/native/flecs_helpers.c
+++ b/native/flecs_helpers.c
@@ -3,1199 +3,1207 @@
 #else
     #define BINDGEN_API __attribute__((visibility("default")))
 #endif
-extern void* ECS_AUTO_OVERRIDE;
-extern void* ecs_block_allocator_alloc_count;
-extern void* ecs_block_allocator_free_count;
-extern void* ecs_http_busy_count;
-extern void* ecs_http_request_handled_error_count;
-extern void* ecs_http_request_handled_ok_count;
-extern void* ecs_http_request_invalid_count;
-extern void* ecs_http_request_not_handled_count;
-extern void* ecs_http_request_preflight_count;
-extern void* ecs_http_request_received_count;
-extern void* ecs_http_send_error_count;
-extern void* ecs_http_send_ok_count;
-extern void* ecs_os_api;
-extern void* ecs_os_api_calloc_count;
-extern void* ecs_os_api_free_count;
-extern void* ecs_os_api_malloc_count;
-extern void* ecs_os_api_realloc_count;
-extern void* ECS_PAIR;
-extern void* ecs_stack_allocator_alloc_count;
-extern void* ecs_stack_allocator_free_count;
-extern void* ECS_TOGGLE;
-extern void* EcsAcceleration;
-extern void* EcsAcyclic;
-extern void* EcsAlertCritical;
-extern void* EcsAlertError;
-extern void* EcsAlertInfo;
-extern void* EcsAlertWarning;
-extern void* EcsAlias;
-extern void* EcsAmount;
-extern void* EcsAmpere;
-extern void* EcsAngle;
-extern void* EcsAny;
-extern void* EcsAtto;
-extern void* EcsBar;
-extern void* EcsBel;
-extern void* EcsBits;
-extern void* EcsBitsPerSecond;
-extern void* EcsBytes;
-extern void* EcsBytesPerSecond;
-extern void* EcsCandela;
-extern void* EcsCanToggle;
-extern void* EcsCelsius;
-extern void* EcsCenti;
-extern void* EcsCentiMeters;
-extern void* EcsChildOf;
-extern void* EcsColor;
-extern void* EcsColorCss;
-extern void* EcsColorHsl;
-extern void* EcsColorRgb;
-extern void* EcsConstant;
-extern void* EcsCounter;
-extern void* EcsCounterId;
-extern void* EcsCounterIncrement;
-extern void* EcsData;
-extern void* EcsDataRate;
-extern void* EcsDate;
-extern void* EcsDays;
-extern void* EcsDeca;
-extern void* EcsDeci;
-extern void* EcsDeciBel;
-extern void* EcsDegrees;
-extern void* EcsDelete;
-extern void* EcsDependsOn;
-extern void* EcsDisabled;
-extern void* EcsDocBrief;
-extern void* EcsDocColor;
-extern void* EcsDocDetail;
-extern void* EcsDocLink;
-extern void* EcsDocUuid;
-extern void* EcsDontInherit;
-extern void* EcsDuration;
-extern void* EcsElectricCurrent;
-extern void* EcsEmpty;
-extern void* EcsExa;
-extern void* EcsExbi;
-extern void* EcsExclusive;
-extern void* EcsFahrenheit;
-extern void* EcsFemto;
-extern void* EcsFinal;
-extern void* EcsFlecs;
-extern void* EcsFlecsCore;
-extern void* EcsForce;
-extern void* EcsFrequency;
-extern void* EcsGauge;
-extern void* EcsGibi;
-extern void* EcsGibiBytes;
-extern void* EcsGiga;
-extern void* EcsGigaBits;
-extern void* EcsGigaBitsPerSecond;
-extern void* EcsGigaBytes;
-extern void* EcsGigaBytesPerSecond;
-extern void* EcsGigaHertz;
-extern void* EcsGrams;
-extern void* EcsHecto;
-extern void* EcsHertz;
-extern void* EcsHours;
-extern void* EcsInherit;
-extern void* EcsInheritable;
-extern void* EcsIsA;
-extern void* EcsKelvin;
-extern void* EcsKibi;
-extern void* EcsKibiBytes;
-extern void* EcsKilo;
-extern void* EcsKiloBits;
-extern void* EcsKiloBitsPerSecond;
-extern void* EcsKiloBytes;
-extern void* EcsKiloBytesPerSecond;
-extern void* EcsKiloGrams;
-extern void* EcsKiloHertz;
-extern void* EcsKiloMeters;
-extern void* EcsKiloMetersPerHour;
-extern void* EcsKiloMetersPerSecond;
-extern void* EcsLength;
-extern void* EcsLuminousIntensity;
-extern void* EcsMass;
-extern void* EcsMebi;
-extern void* EcsMebiBytes;
-extern void* EcsMega;
-extern void* EcsMegaBits;
-extern void* EcsMegaBitsPerSecond;
-extern void* EcsMegaBytes;
-extern void* EcsMegaBytesPerSecond;
-extern void* EcsMegaHertz;
-extern void* EcsMeters;
-extern void* EcsMetersPerSecond;
-extern void* EcsMetric;
-extern void* EcsMetricInstance;
-extern void* EcsMicro;
-extern void* EcsMicroMeters;
-extern void* EcsMicroSeconds;
-extern void* EcsMiles;
-extern void* EcsMilesPerHour;
-extern void* EcsMilli;
-extern void* EcsMilliMeters;
-extern void* EcsMilliSeconds;
-extern void* EcsMinutes;
-extern void* EcsModule;
-extern void* EcsMole;
-extern void* EcsMonitor;
-extern void* EcsName;
-extern void* EcsNano;
-extern void* EcsNanoMeters;
-extern void* EcsNanoSeconds;
-extern void* EcsNewton;
-extern void* EcsNotQueryable;
-extern void* EcsObserver;
-extern void* EcsOnAdd;
-extern void* EcsOnDelete;
-extern void* EcsOnDeleteTarget;
-extern void* EcsOneOf;
-extern void* EcsOnInstantiate;
-extern void* EcsOnLoad;
-extern void* EcsOnRemove;
-extern void* EcsOnSet;
-extern void* EcsOnStart;
-extern void* EcsOnStore;
-extern void* EcsOnTableCreate;
-extern void* EcsOnTableDelete;
-extern void* EcsOnUpdate;
-extern void* EcsOnValidate;
-extern void* EcsOverride;
-extern void* EcsPairIsTag;
-extern void* EcsPanic;
-extern void* EcsPascal;
-extern void* EcsPebi;
-extern void* EcsPercentage;
-extern void* EcsPeriod1d;
-extern void* EcsPeriod1h;
-extern void* EcsPeriod1m;
-extern void* EcsPeriod1s;
-extern void* EcsPeriod1w;
-extern void* EcsPeta;
-extern void* EcsPhase;
-extern void* EcsPico;
-extern void* EcsPicoMeters;
-extern void* EcsPicoSeconds;
-extern void* EcsPixels;
-extern void* EcsPostFrame;
-extern void* EcsPostLoad;
-extern void* EcsPostUpdate;
-extern void* EcsPredEq;
-extern void* EcsPredLookup;
-extern void* EcsPredMatch;
-extern void* EcsPrefab;
-extern void* EcsPreFrame;
-extern void* EcsPressure;
-extern void* EcsPreStore;
-extern void* EcsPreUpdate;
-extern void* EcsPrivate;
-extern void* EcsQuantity;
-extern void* EcsQuery;
-extern void* EcsRadians;
-extern void* EcsReflexive;
-extern void* EcsRelationship;
-extern void* EcsRemove;
-extern void* EcsScopeClose;
-extern void* EcsScopeOpen;
-extern void* EcsScriptTemplate;
-extern void* EcsSeconds;
-extern void* EcsSlotOf;
-extern void* EcsSparse;
-extern void* EcsSpeed;
-extern void* EcsSymbol;
-extern void* EcsSymmetric;
-extern void* EcsSystem;
-extern void* EcsTarget;
-extern void* EcsTebi;
-extern void* EcsTemperature;
-extern void* EcsTera;
-extern void* EcsThis;
-extern void* EcsTime;
-extern void* EcsTrait;
-extern void* EcsTransitive;
-extern void* EcsTraversable;
-extern void* EcsUnion;
-extern void* EcsUnitPrefixes;
-extern void* EcsUri;
-extern void* EcsUriFile;
-extern void* EcsUriHyperlink;
-extern void* EcsUriImage;
-extern void* EcsVariable;
-extern void* EcsWildcard;
-extern void* EcsWith;
-extern void* EcsWorld;
-extern void* EcsYobi;
-extern void* EcsYocto;
-extern void* EcsYotta;
-extern void* EcsZebi;
-extern void* EcsZepto;
-extern void* EcsZetta;
-extern void* FLECS_IDecs_bool_tID_;
-extern void* FLECS_IDecs_byte_tID_;
-extern void* FLECS_IDecs_char_tID_;
-extern void* FLECS_IDecs_entity_tID_;
-extern void* FLECS_IDecs_f32_tID_;
-extern void* FLECS_IDecs_f64_tID_;
-extern void* FLECS_IDecs_i16_tID_;
-extern void* FLECS_IDecs_i32_tID_;
-extern void* FLECS_IDecs_i64_tID_;
-extern void* FLECS_IDecs_i8_tID_;
-extern void* FLECS_IDecs_id_tID_;
-extern void* FLECS_IDecs_iptr_tID_;
-extern void* FLECS_IDecs_string_tID_;
-extern void* FLECS_IDecs_u16_tID_;
-extern void* FLECS_IDecs_u32_tID_;
-extern void* FLECS_IDecs_u64_tID_;
-extern void* FLECS_IDecs_u8_tID_;
-extern void* FLECS_IDecs_uptr_tID_;
-extern void* FLECS_IDEcsAlertCriticalID_;
-extern void* FLECS_IDEcsAlertErrorID_;
-extern void* FLECS_IDEcsAlertID_;
-extern void* FLECS_IDEcsAlertInfoID_;
-extern void* FLECS_IDEcsAlertInstanceID_;
-extern void* FLECS_IDEcsAlertsActiveID_;
-extern void* FLECS_IDEcsAlertTimeoutID_;
-extern void* FLECS_IDEcsAlertWarningID_;
-extern void* FLECS_IDEcsArrayID_;
-extern void* FLECS_IDEcsBitmaskID_;
-extern void* FLECS_IDEcsComponentID_;
-extern void* FLECS_IDEcsCounterID_;
-extern void* FLECS_IDEcsCounterIdID_;
-extern void* FLECS_IDEcsCounterIncrementID_;
-extern void* FLECS_IDEcsDefaultChildComponentID_;
-extern void* FLECS_IDEcsDocDescriptionID_;
-extern void* FLECS_IDEcsEnumID_;
-extern void* FLECS_IDEcsGaugeID_;
-extern void* FLECS_IDEcsIdentifierID_;
-extern void* FLECS_IDEcsMemberID_;
-extern void* FLECS_IDEcsMemberRangesID_;
-extern void* FLECS_IDEcsMetricID_;
-extern void* FLECS_IDEcsMetricInstanceID_;
-extern void* FLECS_IDEcsMetricSourceID_;
-extern void* FLECS_IDEcsMetricValueID_;
-extern void* FLECS_IDEcsOpaqueID_;
-extern void* FLECS_IDEcsPipelineID_;
-extern void* FLECS_IDEcsPipelineStatsID_;
-extern void* FLECS_IDEcsPolyID_;
-extern void* FLECS_IDEcsPrimitiveID_;
-extern void* FLECS_IDEcsRateFilterID_;
-extern void* FLECS_IDEcsRestID_;
-extern void* FLECS_IDEcsScriptConstVarID_;
-extern void* FLECS_IDEcsScriptFunctionID_;
-extern void* FLECS_IDEcsScriptID_;
-extern void* FLECS_IDEcsScriptMethodID_;
-extern void* FLECS_IDEcsScriptTemplateID_;
-extern void* FLECS_IDEcsStructID_;
-extern void* FLECS_IDEcsSystemStatsID_;
-extern void* FLECS_IDEcsTickSourceID_;
-extern void* FLECS_IDEcsTimerID_;
-extern void* FLECS_IDEcsTypeID_;
-extern void* FLECS_IDEcsTypeSerializerID_;
-extern void* FLECS_IDEcsUnitID_;
-extern void* FLECS_IDEcsUnitPrefixID_;
-extern void* FLECS_IDEcsVectorID_;
-extern void* FLECS_IDEcsWorldStatsID_;
-extern void* FLECS_IDEcsWorldSummaryID_;
-extern void* FLECS_IDFlecsAlertsID_;
-extern void* FLECS_IDFlecsMetricsID_;
-extern void* FLECS_IDFlecsStatsID_;
+extern void* ECS_AUTO_OVERRIDE;
+extern void* ecs_block_allocator_alloc_count;
+extern void* ecs_block_allocator_free_count;
+extern void* ecs_http_busy_count;
+extern void* ecs_http_request_handled_error_count;
+extern void* ecs_http_request_handled_ok_count;
+extern void* ecs_http_request_invalid_count;
+extern void* ecs_http_request_not_handled_count;
+extern void* ecs_http_request_preflight_count;
+extern void* ecs_http_request_received_count;
+extern void* ecs_http_send_error_count;
+extern void* ecs_http_send_ok_count;
+extern void* ecs_os_api;
+extern void* ecs_os_api_calloc_count;
+extern void* ecs_os_api_free_count;
+extern void* ecs_os_api_malloc_count;
+extern void* ecs_os_api_realloc_count;
+extern void* ECS_PAIR;
+extern void* ecs_stack_allocator_alloc_count;
+extern void* ecs_stack_allocator_free_count;
+extern void* ECS_TOGGLE;
+extern void* EcsAcceleration;
+extern void* EcsAcyclic;
+extern void* EcsAlertCritical;
+extern void* EcsAlertError;
+extern void* EcsAlertInfo;
+extern void* EcsAlertWarning;
+extern void* EcsAlias;
+extern void* EcsAmount;
+extern void* EcsAmpere;
+extern void* EcsAngle;
+extern void* EcsAny;
+extern void* EcsAtto;
+extern void* EcsBar;
+extern void* EcsBel;
+extern void* EcsBits;
+extern void* EcsBitsPerSecond;
+extern void* EcsBytes;
+extern void* EcsBytesPerSecond;
+extern void* EcsCandela;
+extern void* EcsCanToggle;
+extern void* EcsCelsius;
+extern void* EcsCenti;
+extern void* EcsCentiMeters;
+extern void* EcsChildOf;
+extern void* EcsColor;
+extern void* EcsColorCss;
+extern void* EcsColorHsl;
+extern void* EcsColorRgb;
+extern void* EcsConstant;
+extern void* EcsCounter;
+extern void* EcsCounterId;
+extern void* EcsCounterIncrement;
+extern void* EcsData;
+extern void* EcsDataRate;
+extern void* EcsDate;
+extern void* EcsDays;
+extern void* EcsDeca;
+extern void* EcsDeci;
+extern void* EcsDeciBel;
+extern void* EcsDegrees;
+extern void* EcsDelete;
+extern void* EcsDependsOn;
+extern void* EcsDisabled;
+extern void* EcsDocBrief;
+extern void* EcsDocColor;
+extern void* EcsDocDetail;
+extern void* EcsDocLink;
+extern void* EcsDocUuid;
+extern void* EcsDontFragment;
+extern void* EcsDontInherit;
+extern void* EcsDuration;
+extern void* EcsElectricCurrent;
+extern void* EcsEmpty;
+extern void* EcsExa;
+extern void* EcsExbi;
+extern void* EcsExclusive;
+extern void* EcsFahrenheit;
+extern void* EcsFemto;
+extern void* EcsFinal;
+extern void* EcsFlecs;
+extern void* EcsFlecsCore;
+extern void* EcsForce;
+extern void* EcsFrequency;
+extern void* EcsGauge;
+extern void* EcsGibi;
+extern void* EcsGibiBytes;
+extern void* EcsGiga;
+extern void* EcsGigaBits;
+extern void* EcsGigaBitsPerSecond;
+extern void* EcsGigaBytes;
+extern void* EcsGigaBytesPerSecond;
+extern void* EcsGigaHertz;
+extern void* EcsGrams;
+extern void* EcsHecto;
+extern void* EcsHertz;
+extern void* EcsHours;
+extern void* EcsInherit;
+extern void* EcsInheritable;
+extern void* EcsIsA;
+extern void* EcsKelvin;
+extern void* EcsKibi;
+extern void* EcsKibiBytes;
+extern void* EcsKilo;
+extern void* EcsKiloBits;
+extern void* EcsKiloBitsPerSecond;
+extern void* EcsKiloBytes;
+extern void* EcsKiloBytesPerSecond;
+extern void* EcsKiloGrams;
+extern void* EcsKiloHertz;
+extern void* EcsKiloMeters;
+extern void* EcsKiloMetersPerHour;
+extern void* EcsKiloMetersPerSecond;
+extern void* EcsLength;
+extern void* EcsLuminousIntensity;
+extern void* EcsMass;
+extern void* EcsMebi;
+extern void* EcsMebiBytes;
+extern void* EcsMega;
+extern void* EcsMegaBits;
+extern void* EcsMegaBitsPerSecond;
+extern void* EcsMegaBytes;
+extern void* EcsMegaBytesPerSecond;
+extern void* EcsMegaHertz;
+extern void* EcsMeters;
+extern void* EcsMetersPerSecond;
+extern void* EcsMetric;
+extern void* EcsMetricInstance;
+extern void* EcsMicro;
+extern void* EcsMicroMeters;
+extern void* EcsMicroSeconds;
+extern void* EcsMiles;
+extern void* EcsMilesPerHour;
+extern void* EcsMilli;
+extern void* EcsMilliMeters;
+extern void* EcsMilliSeconds;
+extern void* EcsMinutes;
+extern void* EcsModule;
+extern void* EcsMole;
+extern void* EcsMonitor;
+extern void* EcsName;
+extern void* EcsNano;
+extern void* EcsNanoMeters;
+extern void* EcsNanoSeconds;
+extern void* EcsNewton;
+extern void* EcsNotQueryable;
+extern void* EcsObserver;
+extern void* EcsOnAdd;
+extern void* EcsOnDelete;
+extern void* EcsOnDeleteTarget;
+extern void* EcsOneOf;
+extern void* EcsOnInstantiate;
+extern void* EcsOnLoad;
+extern void* EcsOnRemove;
+extern void* EcsOnSet;
+extern void* EcsOnStart;
+extern void* EcsOnStore;
+extern void* EcsOnTableCreate;
+extern void* EcsOnTableDelete;
+extern void* EcsOnUpdate;
+extern void* EcsOnValidate;
+extern void* EcsOrderedChildren;
+extern void* EcsOverride;
+extern void* EcsPairIsTag;
+extern void* EcsPanic;
+extern void* EcsPascal;
+extern void* EcsPebi;
+extern void* EcsPercentage;
+extern void* EcsPeriod1d;
+extern void* EcsPeriod1h;
+extern void* EcsPeriod1m;
+extern void* EcsPeriod1s;
+extern void* EcsPeriod1w;
+extern void* EcsPeta;
+extern void* EcsPhase;
+extern void* EcsPico;
+extern void* EcsPicoMeters;
+extern void* EcsPicoSeconds;
+extern void* EcsPixels;
+extern void* EcsPostFrame;
+extern void* EcsPostLoad;
+extern void* EcsPostUpdate;
+extern void* EcsPredEq;
+extern void* EcsPredLookup;
+extern void* EcsPredMatch;
+extern void* EcsPrefab;
+extern void* EcsPreFrame;
+extern void* EcsPressure;
+extern void* EcsPreStore;
+extern void* EcsPreUpdate;
+extern void* EcsPrivate;
+extern void* EcsQuantity;
+extern void* EcsQuery;
+extern void* EcsRadians;
+extern void* EcsReflexive;
+extern void* EcsRelationship;
+extern void* EcsRemove;
+extern void* EcsScopeClose;
+extern void* EcsScopeOpen;
+extern void* EcsScriptTemplate;
+extern void* EcsSeconds;
+extern void* EcsSlotOf;
+extern void* EcsSparse;
+extern void* EcsSpeed;
+extern void* EcsSymbol;
+extern void* EcsSymmetric;
+extern void* EcsSystem;
+extern void* EcsTarget;
+extern void* EcsTebi;
+extern void* EcsTemperature;
+extern void* EcsTera;
+extern void* EcsThis;
+extern void* EcsTime;
+extern void* EcsTrait;
+extern void* EcsTransitive;
+extern void* EcsTraversable;
+extern void* EcsUnitPrefixes;
+extern void* EcsUri;
+extern void* EcsUriFile;
+extern void* EcsUriHyperlink;
+extern void* EcsUriImage;
+extern void* EcsVariable;
+extern void* EcsWildcard;
+extern void* EcsWith;
+extern void* EcsWorld;
+extern void* EcsYobi;
+extern void* EcsYocto;
+extern void* EcsYotta;
+extern void* EcsZebi;
+extern void* EcsZepto;
+extern void* EcsZetta;
+extern void* FLECS_IDecs_bool_tID_;
+extern void* FLECS_IDecs_byte_tID_;
+extern void* FLECS_IDecs_char_tID_;
+extern void* FLECS_IDecs_entity_tID_;
+extern void* FLECS_IDecs_f32_tID_;
+extern void* FLECS_IDecs_f64_tID_;
+extern void* FLECS_IDecs_i16_tID_;
+extern void* FLECS_IDecs_i32_tID_;
+extern void* FLECS_IDecs_i64_tID_;
+extern void* FLECS_IDecs_i8_tID_;
+extern void* FLECS_IDecs_id_tID_;
+extern void* FLECS_IDecs_iptr_tID_;
+extern void* FLECS_IDecs_string_tID_;
+extern void* FLECS_IDecs_u16_tID_;
+extern void* FLECS_IDecs_u32_tID_;
+extern void* FLECS_IDecs_u64_tID_;
+extern void* FLECS_IDecs_u8_tID_;
+extern void* FLECS_IDecs_uptr_tID_;
+extern void* FLECS_IDEcsAlertCriticalID_;
+extern void* FLECS_IDEcsAlertErrorID_;
+extern void* FLECS_IDEcsAlertID_;
+extern void* FLECS_IDEcsAlertInfoID_;
+extern void* FLECS_IDEcsAlertInstanceID_;
+extern void* FLECS_IDEcsAlertsActiveID_;
+extern void* FLECS_IDEcsAlertTimeoutID_;
+extern void* FLECS_IDEcsAlertWarningID_;
+extern void* FLECS_IDEcsArrayID_;
+extern void* FLECS_IDEcsBitmaskID_;
+extern void* FLECS_IDEcsComponentID_;
+extern void* FLECS_IDEcsCounterID_;
+extern void* FLECS_IDEcsCounterIdID_;
+extern void* FLECS_IDEcsCounterIncrementID_;
+extern void* FLECS_IDEcsDefaultChildComponentID_;
+extern void* FLECS_IDEcsDocDescriptionID_;
+extern void* FLECS_IDEcsEnumID_;
+extern void* FLECS_IDEcsGaugeID_;
+extern void* FLECS_IDEcsIdentifierID_;
+extern void* FLECS_IDEcsMemberID_;
+extern void* FLECS_IDEcsMemberRangesID_;
+extern void* FLECS_IDEcsMetricID_;
+extern void* FLECS_IDEcsMetricInstanceID_;
+extern void* FLECS_IDEcsMetricSourceID_;
+extern void* FLECS_IDEcsMetricValueID_;
+extern void* FLECS_IDEcsOpaqueID_;
+extern void* FLECS_IDEcsPipelineID_;
+extern void* FLECS_IDEcsPipelineStatsID_;
+extern void* FLECS_IDEcsPolyID_;
+extern void* FLECS_IDEcsPrimitiveID_;
+extern void* FLECS_IDEcsRateFilterID_;
+extern void* FLECS_IDEcsRestID_;
+extern void* FLECS_IDEcsScriptConstVarID_;
+extern void* FLECS_IDEcsScriptFunctionID_;
+extern void* FLECS_IDEcsScriptID_;
+extern void* FLECS_IDEcsScriptMethodID_;
+extern void* FLECS_IDEcsScriptRngID_;
+extern void* FLECS_IDEcsScriptTemplateID_;
+extern void* FLECS_IDEcsStructID_;
+extern void* FLECS_IDEcsSystemStatsID_;
+extern void* FLECS_IDEcsTickSourceID_;
+extern void* FLECS_IDEcsTimerID_;
+extern void* FLECS_IDEcsTypeID_;
+extern void* FLECS_IDEcsTypeSerializerID_;
+extern void* FLECS_IDEcsUnitID_;
+extern void* FLECS_IDEcsUnitPrefixID_;
+extern void* FLECS_IDEcsVectorID_;
+extern void* FLECS_IDEcsWorldStatsID_;
+extern void* FLECS_IDEcsWorldSummaryID_;
+extern void* FLECS_IDFlecsAlertsID_;
+extern void* FLECS_IDFlecsMetricsID_;
+extern void* FLECS_IDFlecsStatsID_;
 BINDGEN_API void* ECS_AUTO_OVERRIDE_BindgenGetExtern() {
     return &ECS_AUTO_OVERRIDE;
-}
+}
 BINDGEN_API void* ecs_block_allocator_alloc_count_BindgenGetExtern() {
     return &ecs_block_allocator_alloc_count;
-}
+}
 BINDGEN_API void* ecs_block_allocator_free_count_BindgenGetExtern() {
     return &ecs_block_allocator_free_count;
-}
+}
 BINDGEN_API void* ecs_http_busy_count_BindgenGetExtern() {
     return &ecs_http_busy_count;
-}
+}
 BINDGEN_API void* ecs_http_request_handled_error_count_BindgenGetExtern() {
     return &ecs_http_request_handled_error_count;
-}
+}
 BINDGEN_API void* ecs_http_request_handled_ok_count_BindgenGetExtern() {
     return &ecs_http_request_handled_ok_count;
-}
+}
 BINDGEN_API void* ecs_http_request_invalid_count_BindgenGetExtern() {
     return &ecs_http_request_invalid_count;
-}
+}
 BINDGEN_API void* ecs_http_request_not_handled_count_BindgenGetExtern() {
     return &ecs_http_request_not_handled_count;
-}
+}
 BINDGEN_API void* ecs_http_request_preflight_count_BindgenGetExtern() {
     return &ecs_http_request_preflight_count;
-}
+}
 BINDGEN_API void* ecs_http_request_received_count_BindgenGetExtern() {
     return &ecs_http_request_received_count;
-}
+}
 BINDGEN_API void* ecs_http_send_error_count_BindgenGetExtern() {
     return &ecs_http_send_error_count;
-}
+}
 BINDGEN_API void* ecs_http_send_ok_count_BindgenGetExtern() {
     return &ecs_http_send_ok_count;
-}
+}
 BINDGEN_API void* ecs_os_api_BindgenGetExtern() {
     return &ecs_os_api;
-}
+}
 BINDGEN_API void* ecs_os_api_calloc_count_BindgenGetExtern() {
     return &ecs_os_api_calloc_count;
-}
+}
 BINDGEN_API void* ecs_os_api_free_count_BindgenGetExtern() {
     return &ecs_os_api_free_count;
-}
+}
 BINDGEN_API void* ecs_os_api_malloc_count_BindgenGetExtern() {
     return &ecs_os_api_malloc_count;
-}
+}
 BINDGEN_API void* ecs_os_api_realloc_count_BindgenGetExtern() {
     return &ecs_os_api_realloc_count;
-}
+}
 BINDGEN_API void* ECS_PAIR_BindgenGetExtern() {
     return &ECS_PAIR;
-}
+}
 BINDGEN_API void* ecs_stack_allocator_alloc_count_BindgenGetExtern() {
     return &ecs_stack_allocator_alloc_count;
-}
+}
 BINDGEN_API void* ecs_stack_allocator_free_count_BindgenGetExtern() {
     return &ecs_stack_allocator_free_count;
-}
+}
 BINDGEN_API void* ECS_TOGGLE_BindgenGetExtern() {
     return &ECS_TOGGLE;
-}
+}
 BINDGEN_API void* EcsAcceleration_BindgenGetExtern() {
     return &EcsAcceleration;
-}
+}
 BINDGEN_API void* EcsAcyclic_BindgenGetExtern() {
     return &EcsAcyclic;
-}
+}
 BINDGEN_API void* EcsAlertCritical_BindgenGetExtern() {
     return &EcsAlertCritical;
-}
+}
 BINDGEN_API void* EcsAlertError_BindgenGetExtern() {
     return &EcsAlertError;
-}
+}
 BINDGEN_API void* EcsAlertInfo_BindgenGetExtern() {
     return &EcsAlertInfo;
-}
+}
 BINDGEN_API void* EcsAlertWarning_BindgenGetExtern() {
     return &EcsAlertWarning;
-}
+}
 BINDGEN_API void* EcsAlias_BindgenGetExtern() {
     return &EcsAlias;
-}
+}
 BINDGEN_API void* EcsAmount_BindgenGetExtern() {
     return &EcsAmount;
-}
+}
 BINDGEN_API void* EcsAmpere_BindgenGetExtern() {
     return &EcsAmpere;
-}
+}
 BINDGEN_API void* EcsAngle_BindgenGetExtern() {
     return &EcsAngle;
-}
+}
 BINDGEN_API void* EcsAny_BindgenGetExtern() {
     return &EcsAny;
-}
+}
 BINDGEN_API void* EcsAtto_BindgenGetExtern() {
     return &EcsAtto;
-}
+}
 BINDGEN_API void* EcsBar_BindgenGetExtern() {
     return &EcsBar;
-}
+}
 BINDGEN_API void* EcsBel_BindgenGetExtern() {
     return &EcsBel;
-}
+}
 BINDGEN_API void* EcsBits_BindgenGetExtern() {
     return &EcsBits;
-}
+}
 BINDGEN_API void* EcsBitsPerSecond_BindgenGetExtern() {
     return &EcsBitsPerSecond;
-}
+}
 BINDGEN_API void* EcsBytes_BindgenGetExtern() {
     return &EcsBytes;
-}
+}
 BINDGEN_API void* EcsBytesPerSecond_BindgenGetExtern() {
     return &EcsBytesPerSecond;
-}
+}
 BINDGEN_API void* EcsCandela_BindgenGetExtern() {
     return &EcsCandela;
-}
+}
 BINDGEN_API void* EcsCanToggle_BindgenGetExtern() {
     return &EcsCanToggle;
-}
+}
 BINDGEN_API void* EcsCelsius_BindgenGetExtern() {
     return &EcsCelsius;
-}
+}
 BINDGEN_API void* EcsCenti_BindgenGetExtern() {
     return &EcsCenti;
-}
+}
 BINDGEN_API void* EcsCentiMeters_BindgenGetExtern() {
     return &EcsCentiMeters;
-}
+}
 BINDGEN_API void* EcsChildOf_BindgenGetExtern() {
     return &EcsChildOf;
-}
+}
 BINDGEN_API void* EcsColor_BindgenGetExtern() {
     return &EcsColor;
-}
+}
 BINDGEN_API void* EcsColorCss_BindgenGetExtern() {
     return &EcsColorCss;
-}
+}
 BINDGEN_API void* EcsColorHsl_BindgenGetExtern() {
     return &EcsColorHsl;
-}
+}
 BINDGEN_API void* EcsColorRgb_BindgenGetExtern() {
     return &EcsColorRgb;
-}
+}
 BINDGEN_API void* EcsConstant_BindgenGetExtern() {
     return &EcsConstant;
-}
+}
 BINDGEN_API void* EcsCounter_BindgenGetExtern() {
     return &EcsCounter;
-}
+}
 BINDGEN_API void* EcsCounterId_BindgenGetExtern() {
     return &EcsCounterId;
-}
+}
 BINDGEN_API void* EcsCounterIncrement_BindgenGetExtern() {
     return &EcsCounterIncrement;
-}
+}
 BINDGEN_API void* EcsData_BindgenGetExtern() {
     return &EcsData;
-}
+}
 BINDGEN_API void* EcsDataRate_BindgenGetExtern() {
     return &EcsDataRate;
-}
+}
 BINDGEN_API void* EcsDate_BindgenGetExtern() {
     return &EcsDate;
-}
+}
 BINDGEN_API void* EcsDays_BindgenGetExtern() {
     return &EcsDays;
-}
+}
 BINDGEN_API void* EcsDeca_BindgenGetExtern() {
     return &EcsDeca;
-}
+}
 BINDGEN_API void* EcsDeci_BindgenGetExtern() {
     return &EcsDeci;
-}
+}
 BINDGEN_API void* EcsDeciBel_BindgenGetExtern() {
     return &EcsDeciBel;
-}
+}
 BINDGEN_API void* EcsDegrees_BindgenGetExtern() {
     return &EcsDegrees;
-}
+}
 BINDGEN_API void* EcsDelete_BindgenGetExtern() {
     return &EcsDelete;
-}
+}
 BINDGEN_API void* EcsDependsOn_BindgenGetExtern() {
     return &EcsDependsOn;
-}
+}
 BINDGEN_API void* EcsDisabled_BindgenGetExtern() {
     return &EcsDisabled;
-}
+}
 BINDGEN_API void* EcsDocBrief_BindgenGetExtern() {
     return &EcsDocBrief;
-}
+}
 BINDGEN_API void* EcsDocColor_BindgenGetExtern() {
     return &EcsDocColor;
-}
+}
 BINDGEN_API void* EcsDocDetail_BindgenGetExtern() {
     return &EcsDocDetail;
-}
+}
 BINDGEN_API void* EcsDocLink_BindgenGetExtern() {
     return &EcsDocLink;
-}
+}
 BINDGEN_API void* EcsDocUuid_BindgenGetExtern() {
     return &EcsDocUuid;
-}
+}
+BINDGEN_API void* EcsDontFragment_BindgenGetExtern() {
+    return &EcsDontFragment;
+}
 BINDGEN_API void* EcsDontInherit_BindgenGetExtern() {
     return &EcsDontInherit;
-}
+}
 BINDGEN_API void* EcsDuration_BindgenGetExtern() {
     return &EcsDuration;
-}
+}
 BINDGEN_API void* EcsElectricCurrent_BindgenGetExtern() {
     return &EcsElectricCurrent;
-}
+}
 BINDGEN_API void* EcsEmpty_BindgenGetExtern() {
     return &EcsEmpty;
-}
+}
 BINDGEN_API void* EcsExa_BindgenGetExtern() {
     return &EcsExa;
-}
+}
 BINDGEN_API void* EcsExbi_BindgenGetExtern() {
     return &EcsExbi;
-}
+}
 BINDGEN_API void* EcsExclusive_BindgenGetExtern() {
     return &EcsExclusive;
-}
+}
 BINDGEN_API void* EcsFahrenheit_BindgenGetExtern() {
     return &EcsFahrenheit;
-}
+}
 BINDGEN_API void* EcsFemto_BindgenGetExtern() {
     return &EcsFemto;
-}
+}
 BINDGEN_API void* EcsFinal_BindgenGetExtern() {
     return &EcsFinal;
-}
+}
 BINDGEN_API void* EcsFlecs_BindgenGetExtern() {
     return &EcsFlecs;
-}
+}
 BINDGEN_API void* EcsFlecsCore_BindgenGetExtern() {
     return &EcsFlecsCore;
-}
+}
 BINDGEN_API void* EcsForce_BindgenGetExtern() {
     return &EcsForce;
-}
+}
 BINDGEN_API void* EcsFrequency_BindgenGetExtern() {
     return &EcsFrequency;
-}
+}
 BINDGEN_API void* EcsGauge_BindgenGetExtern() {
     return &EcsGauge;
-}
+}
 BINDGEN_API void* EcsGibi_BindgenGetExtern() {
     return &EcsGibi;
-}
+}
 BINDGEN_API void* EcsGibiBytes_BindgenGetExtern() {
     return &EcsGibiBytes;
-}
+}
 BINDGEN_API void* EcsGiga_BindgenGetExtern() {
     return &EcsGiga;
-}
+}
 BINDGEN_API void* EcsGigaBits_BindgenGetExtern() {
     return &EcsGigaBits;
-}
+}
 BINDGEN_API void* EcsGigaBitsPerSecond_BindgenGetExtern() {
     return &EcsGigaBitsPerSecond;
-}
+}
 BINDGEN_API void* EcsGigaBytes_BindgenGetExtern() {
     return &EcsGigaBytes;
-}
+}
 BINDGEN_API void* EcsGigaBytesPerSecond_BindgenGetExtern() {
     return &EcsGigaBytesPerSecond;
-}
+}
 BINDGEN_API void* EcsGigaHertz_BindgenGetExtern() {
     return &EcsGigaHertz;
-}
+}
 BINDGEN_API void* EcsGrams_BindgenGetExtern() {
     return &EcsGrams;
-}
+}
 BINDGEN_API void* EcsHecto_BindgenGetExtern() {
     return &EcsHecto;
-}
+}
 BINDGEN_API void* EcsHertz_BindgenGetExtern() {
     return &EcsHertz;
-}
+}
 BINDGEN_API void* EcsHours_BindgenGetExtern() {
     return &EcsHours;
-}
+}
 BINDGEN_API void* EcsInherit_BindgenGetExtern() {
     return &EcsInherit;
-}
+}
 BINDGEN_API void* EcsInheritable_BindgenGetExtern() {
     return &EcsInheritable;
-}
+}
 BINDGEN_API void* EcsIsA_BindgenGetExtern() {
     return &EcsIsA;
-}
+}
 BINDGEN_API void* EcsKelvin_BindgenGetExtern() {
     return &EcsKelvin;
-}
+}
 BINDGEN_API void* EcsKibi_BindgenGetExtern() {
     return &EcsKibi;
-}
+}
 BINDGEN_API void* EcsKibiBytes_BindgenGetExtern() {
     return &EcsKibiBytes;
-}
+}
 BINDGEN_API void* EcsKilo_BindgenGetExtern() {
     return &EcsKilo;
-}
+}
 BINDGEN_API void* EcsKiloBits_BindgenGetExtern() {
     return &EcsKiloBits;
-}
+}
 BINDGEN_API void* EcsKiloBitsPerSecond_BindgenGetExtern() {
     return &EcsKiloBitsPerSecond;
-}
+}
 BINDGEN_API void* EcsKiloBytes_BindgenGetExtern() {
     return &EcsKiloBytes;
-}
+}
 BINDGEN_API void* EcsKiloBytesPerSecond_BindgenGetExtern() {
     return &EcsKiloBytesPerSecond;
-}
+}
 BINDGEN_API void* EcsKiloGrams_BindgenGetExtern() {
     return &EcsKiloGrams;
-}
+}
 BINDGEN_API void* EcsKiloHertz_BindgenGetExtern() {
     return &EcsKiloHertz;
-}
+}
 BINDGEN_API void* EcsKiloMeters_BindgenGetExtern() {
     return &EcsKiloMeters;
-}
+}
 BINDGEN_API void* EcsKiloMetersPerHour_BindgenGetExtern() {
     return &EcsKiloMetersPerHour;
-}
+}
 BINDGEN_API void* EcsKiloMetersPerSecond_BindgenGetExtern() {
     return &EcsKiloMetersPerSecond;
-}
+}
 BINDGEN_API void* EcsLength_BindgenGetExtern() {
     return &EcsLength;
-}
+}
 BINDGEN_API void* EcsLuminousIntensity_BindgenGetExtern() {
     return &EcsLuminousIntensity;
-}
+}
 BINDGEN_API void* EcsMass_BindgenGetExtern() {
     return &EcsMass;
-}
+}
 BINDGEN_API void* EcsMebi_BindgenGetExtern() {
     return &EcsMebi;
-}
+}
 BINDGEN_API void* EcsMebiBytes_BindgenGetExtern() {
     return &EcsMebiBytes;
-}
+}
 BINDGEN_API void* EcsMega_BindgenGetExtern() {
     return &EcsMega;
-}
+}
 BINDGEN_API void* EcsMegaBits_BindgenGetExtern() {
     return &EcsMegaBits;
-}
+}
 BINDGEN_API void* EcsMegaBitsPerSecond_BindgenGetExtern() {
     return &EcsMegaBitsPerSecond;
-}
+}
 BINDGEN_API void* EcsMegaBytes_BindgenGetExtern() {
     return &EcsMegaBytes;
-}
+}
 BINDGEN_API void* EcsMegaBytesPerSecond_BindgenGetExtern() {
     return &EcsMegaBytesPerSecond;
-}
+}
 BINDGEN_API void* EcsMegaHertz_BindgenGetExtern() {
     return &EcsMegaHertz;
-}
+}
 BINDGEN_API void* EcsMeters_BindgenGetExtern() {
     return &EcsMeters;
-}
+}
 BINDGEN_API void* EcsMetersPerSecond_BindgenGetExtern() {
     return &EcsMetersPerSecond;
-}
+}
 BINDGEN_API void* EcsMetric_BindgenGetExtern() {
     return &EcsMetric;
-}
+}
 BINDGEN_API void* EcsMetricInstance_BindgenGetExtern() {
     return &EcsMetricInstance;
-}
+}
 BINDGEN_API void* EcsMicro_BindgenGetExtern() {
     return &EcsMicro;
-}
+}
 BINDGEN_API void* EcsMicroMeters_BindgenGetExtern() {
     return &EcsMicroMeters;
-}
+}
 BINDGEN_API void* EcsMicroSeconds_BindgenGetExtern() {
     return &EcsMicroSeconds;
-}
+}
 BINDGEN_API void* EcsMiles_BindgenGetExtern() {
     return &EcsMiles;
-}
+}
 BINDGEN_API void* EcsMilesPerHour_BindgenGetExtern() {
     return &EcsMilesPerHour;
-}
+}
 BINDGEN_API void* EcsMilli_BindgenGetExtern() {
     return &EcsMilli;
-}
+}
 BINDGEN_API void* EcsMilliMeters_BindgenGetExtern() {
     return &EcsMilliMeters;
-}
+}
 BINDGEN_API void* EcsMilliSeconds_BindgenGetExtern() {
     return &EcsMilliSeconds;
-}
+}
 BINDGEN_API void* EcsMinutes_BindgenGetExtern() {
     return &EcsMinutes;
-}
+}
 BINDGEN_API void* EcsModule_BindgenGetExtern() {
     return &EcsModule;
-}
+}
 BINDGEN_API void* EcsMole_BindgenGetExtern() {
     return &EcsMole;
-}
+}
 BINDGEN_API void* EcsMonitor_BindgenGetExtern() {
     return &EcsMonitor;
-}
+}
 BINDGEN_API void* EcsName_BindgenGetExtern() {
     return &EcsName;
-}
+}
 BINDGEN_API void* EcsNano_BindgenGetExtern() {
     return &EcsNano;
-}
+}
 BINDGEN_API void* EcsNanoMeters_BindgenGetExtern() {
     return &EcsNanoMeters;
-}
+}
 BINDGEN_API void* EcsNanoSeconds_BindgenGetExtern() {
     return &EcsNanoSeconds;
-}
+}
 BINDGEN_API void* EcsNewton_BindgenGetExtern() {
     return &EcsNewton;
-}
+}
 BINDGEN_API void* EcsNotQueryable_BindgenGetExtern() {
     return &EcsNotQueryable;
-}
+}
 BINDGEN_API void* EcsObserver_BindgenGetExtern() {
     return &EcsObserver;
-}
+}
 BINDGEN_API void* EcsOnAdd_BindgenGetExtern() {
     return &EcsOnAdd;
-}
+}
 BINDGEN_API void* EcsOnDelete_BindgenGetExtern() {
     return &EcsOnDelete;
-}
+}
 BINDGEN_API void* EcsOnDeleteTarget_BindgenGetExtern() {
     return &EcsOnDeleteTarget;
-}
+}
 BINDGEN_API void* EcsOneOf_BindgenGetExtern() {
     return &EcsOneOf;
-}
+}
 BINDGEN_API void* EcsOnInstantiate_BindgenGetExtern() {
     return &EcsOnInstantiate;
-}
+}
 BINDGEN_API void* EcsOnLoad_BindgenGetExtern() {
     return &EcsOnLoad;
-}
+}
 BINDGEN_API void* EcsOnRemove_BindgenGetExtern() {
     return &EcsOnRemove;
-}
+}
 BINDGEN_API void* EcsOnSet_BindgenGetExtern() {
     return &EcsOnSet;
-}
+}
 BINDGEN_API void* EcsOnStart_BindgenGetExtern() {
     return &EcsOnStart;
-}
+}
 BINDGEN_API void* EcsOnStore_BindgenGetExtern() {
     return &EcsOnStore;
-}
+}
 BINDGEN_API void* EcsOnTableCreate_BindgenGetExtern() {
     return &EcsOnTableCreate;
-}
+}
 BINDGEN_API void* EcsOnTableDelete_BindgenGetExtern() {
     return &EcsOnTableDelete;
-}
+}
 BINDGEN_API void* EcsOnUpdate_BindgenGetExtern() {
     return &EcsOnUpdate;
-}
+}
 BINDGEN_API void* EcsOnValidate_BindgenGetExtern() {
     return &EcsOnValidate;
-}
+}
+BINDGEN_API void* EcsOrderedChildren_BindgenGetExtern() {
+    return &EcsOrderedChildren;
+}
 BINDGEN_API void* EcsOverride_BindgenGetExtern() {
     return &EcsOverride;
-}
+}
 BINDGEN_API void* EcsPairIsTag_BindgenGetExtern() {
     return &EcsPairIsTag;
-}
+}
 BINDGEN_API void* EcsPanic_BindgenGetExtern() {
     return &EcsPanic;
-}
+}
 BINDGEN_API void* EcsPascal_BindgenGetExtern() {
     return &EcsPascal;
-}
+}
 BINDGEN_API void* EcsPebi_BindgenGetExtern() {
     return &EcsPebi;
-}
+}
 BINDGEN_API void* EcsPercentage_BindgenGetExtern() {
     return &EcsPercentage;
-}
+}
 BINDGEN_API void* EcsPeriod1d_BindgenGetExtern() {
     return &EcsPeriod1d;
-}
+}
 BINDGEN_API void* EcsPeriod1h_BindgenGetExtern() {
     return &EcsPeriod1h;
-}
+}
 BINDGEN_API void* EcsPeriod1m_BindgenGetExtern() {
     return &EcsPeriod1m;
-}
+}
 BINDGEN_API void* EcsPeriod1s_BindgenGetExtern() {
     return &EcsPeriod1s;
-}
+}
 BINDGEN_API void* EcsPeriod1w_BindgenGetExtern() {
     return &EcsPeriod1w;
-}
+}
 BINDGEN_API void* EcsPeta_BindgenGetExtern() {
     return &EcsPeta;
-}
+}
 BINDGEN_API void* EcsPhase_BindgenGetExtern() {
     return &EcsPhase;
-}
+}
 BINDGEN_API void* EcsPico_BindgenGetExtern() {
     return &EcsPico;
-}
+}
 BINDGEN_API void* EcsPicoMeters_BindgenGetExtern() {
     return &EcsPicoMeters;
-}
+}
 BINDGEN_API void* EcsPicoSeconds_BindgenGetExtern() {
     return &EcsPicoSeconds;
-}
+}
 BINDGEN_API void* EcsPixels_BindgenGetExtern() {
     return &EcsPixels;
-}
+}
 BINDGEN_API void* EcsPostFrame_BindgenGetExtern() {
     return &EcsPostFrame;
-}
+}
 BINDGEN_API void* EcsPostLoad_BindgenGetExtern() {
     return &EcsPostLoad;
-}
+}
 BINDGEN_API void* EcsPostUpdate_BindgenGetExtern() {
     return &EcsPostUpdate;
-}
+}
 BINDGEN_API void* EcsPredEq_BindgenGetExtern() {
     return &EcsPredEq;
-}
+}
 BINDGEN_API void* EcsPredLookup_BindgenGetExtern() {
     return &EcsPredLookup;
-}
+}
 BINDGEN_API void* EcsPredMatch_BindgenGetExtern() {
     return &EcsPredMatch;
-}
+}
 BINDGEN_API void* EcsPrefab_BindgenGetExtern() {
     return &EcsPrefab;
-}
+}
 BINDGEN_API void* EcsPreFrame_BindgenGetExtern() {
     return &EcsPreFrame;
-}
+}
 BINDGEN_API void* EcsPressure_BindgenGetExtern() {
     return &EcsPressure;
-}
+}
 BINDGEN_API void* EcsPreStore_BindgenGetExtern() {
     return &EcsPreStore;
-}
+}
 BINDGEN_API void* EcsPreUpdate_BindgenGetExtern() {
     return &EcsPreUpdate;
-}
+}
 BINDGEN_API void* EcsPrivate_BindgenGetExtern() {
     return &EcsPrivate;
-}
+}
 BINDGEN_API void* EcsQuantity_BindgenGetExtern() {
     return &EcsQuantity;
-}
+}
 BINDGEN_API void* EcsQuery_BindgenGetExtern() {
     return &EcsQuery;
-}
+}
 BINDGEN_API void* EcsRadians_BindgenGetExtern() {
     return &EcsRadians;
-}
+}
 BINDGEN_API void* EcsReflexive_BindgenGetExtern() {
     return &EcsReflexive;
-}
+}
 BINDGEN_API void* EcsRelationship_BindgenGetExtern() {
     return &EcsRelationship;
-}
+}
 BINDGEN_API void* EcsRemove_BindgenGetExtern() {
     return &EcsRemove;
-}
+}
 BINDGEN_API void* EcsScopeClose_BindgenGetExtern() {
     return &EcsScopeClose;
-}
+}
 BINDGEN_API void* EcsScopeOpen_BindgenGetExtern() {
     return &EcsScopeOpen;
-}
+}
 BINDGEN_API void* EcsScriptTemplate_BindgenGetExtern() {
     return &EcsScriptTemplate;
-}
+}
 BINDGEN_API void* EcsSeconds_BindgenGetExtern() {
     return &EcsSeconds;
-}
+}
 BINDGEN_API void* EcsSlotOf_BindgenGetExtern() {
     return &EcsSlotOf;
-}
+}
 BINDGEN_API void* EcsSparse_BindgenGetExtern() {
     return &EcsSparse;
-}
+}
 BINDGEN_API void* EcsSpeed_BindgenGetExtern() {
     return &EcsSpeed;
-}
+}
 BINDGEN_API void* EcsSymbol_BindgenGetExtern() {
     return &EcsSymbol;
-}
+}
 BINDGEN_API void* EcsSymmetric_BindgenGetExtern() {
     return &EcsSymmetric;
-}
+}
 BINDGEN_API void* EcsSystem_BindgenGetExtern() {
     return &EcsSystem;
-}
+}
 BINDGEN_API void* EcsTarget_BindgenGetExtern() {
     return &EcsTarget;
-}
+}
 BINDGEN_API void* EcsTebi_BindgenGetExtern() {
     return &EcsTebi;
-}
+}
 BINDGEN_API void* EcsTemperature_BindgenGetExtern() {
     return &EcsTemperature;
-}
+}
 BINDGEN_API void* EcsTera_BindgenGetExtern() {
     return &EcsTera;
-}
+}
 BINDGEN_API void* EcsThis_BindgenGetExtern() {
     return &EcsThis;
-}
+}
 BINDGEN_API void* EcsTime_BindgenGetExtern() {
     return &EcsTime;
-}
+}
 BINDGEN_API void* EcsTrait_BindgenGetExtern() {
     return &EcsTrait;
-}
+}
 BINDGEN_API void* EcsTransitive_BindgenGetExtern() {
     return &EcsTransitive;
-}
+}
 BINDGEN_API void* EcsTraversable_BindgenGetExtern() {
     return &EcsTraversable;
-}
-BINDGEN_API void* EcsUnion_BindgenGetExtern() {
-    return &EcsUnion;
-}
+}
 BINDGEN_API void* EcsUnitPrefixes_BindgenGetExtern() {
     return &EcsUnitPrefixes;
-}
+}
 BINDGEN_API void* EcsUri_BindgenGetExtern() {
     return &EcsUri;
-}
+}
 BINDGEN_API void* EcsUriFile_BindgenGetExtern() {
     return &EcsUriFile;
-}
+}
 BINDGEN_API void* EcsUriHyperlink_BindgenGetExtern() {
     return &EcsUriHyperlink;
-}
+}
 BINDGEN_API void* EcsUriImage_BindgenGetExtern() {
     return &EcsUriImage;
-}
+}
 BINDGEN_API void* EcsVariable_BindgenGetExtern() {
     return &EcsVariable;
-}
+}
 BINDGEN_API void* EcsWildcard_BindgenGetExtern() {
     return &EcsWildcard;
-}
+}
 BINDGEN_API void* EcsWith_BindgenGetExtern() {
     return &EcsWith;
-}
+}
 BINDGEN_API void* EcsWorld_BindgenGetExtern() {
     return &EcsWorld;
-}
+}
 BINDGEN_API void* EcsYobi_BindgenGetExtern() {
     return &EcsYobi;
-}
+}
 BINDGEN_API void* EcsYocto_BindgenGetExtern() {
     return &EcsYocto;
-}
+}
 BINDGEN_API void* EcsYotta_BindgenGetExtern() {
     return &EcsYotta;
-}
+}
 BINDGEN_API void* EcsZebi_BindgenGetExtern() {
     return &EcsZebi;
-}
+}
 BINDGEN_API void* EcsZepto_BindgenGetExtern() {
     return &EcsZepto;
-}
+}
 BINDGEN_API void* EcsZetta_BindgenGetExtern() {
     return &EcsZetta;
-}
+}
 BINDGEN_API void* FLECS_IDecs_bool_tID__BindgenGetExtern() {
     return &FLECS_IDecs_bool_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_byte_tID__BindgenGetExtern() {
     return &FLECS_IDecs_byte_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_char_tID__BindgenGetExtern() {
     return &FLECS_IDecs_char_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_entity_tID__BindgenGetExtern() {
     return &FLECS_IDecs_entity_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_f32_tID__BindgenGetExtern() {
     return &FLECS_IDecs_f32_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_f64_tID__BindgenGetExtern() {
     return &FLECS_IDecs_f64_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_i16_tID__BindgenGetExtern() {
     return &FLECS_IDecs_i16_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_i32_tID__BindgenGetExtern() {
     return &FLECS_IDecs_i32_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_i64_tID__BindgenGetExtern() {
     return &FLECS_IDecs_i64_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_i8_tID__BindgenGetExtern() {
     return &FLECS_IDecs_i8_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_id_tID__BindgenGetExtern() {
     return &FLECS_IDecs_id_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_iptr_tID__BindgenGetExtern() {
     return &FLECS_IDecs_iptr_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_string_tID__BindgenGetExtern() {
     return &FLECS_IDecs_string_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_u16_tID__BindgenGetExtern() {
     return &FLECS_IDecs_u16_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_u32_tID__BindgenGetExtern() {
     return &FLECS_IDecs_u32_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_u64_tID__BindgenGetExtern() {
     return &FLECS_IDecs_u64_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_u8_tID__BindgenGetExtern() {
     return &FLECS_IDecs_u8_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDecs_uptr_tID__BindgenGetExtern() {
     return &FLECS_IDecs_uptr_tID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertCriticalID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertCriticalID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertErrorID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertErrorID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertInfoID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertInfoID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertInstanceID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertInstanceID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertsActiveID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertsActiveID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertTimeoutID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertTimeoutID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsAlertWarningID__BindgenGetExtern() {
     return &FLECS_IDEcsAlertWarningID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsArrayID__BindgenGetExtern() {
     return &FLECS_IDEcsArrayID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsBitmaskID__BindgenGetExtern() {
     return &FLECS_IDEcsBitmaskID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsComponentID__BindgenGetExtern() {
     return &FLECS_IDEcsComponentID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsCounterID__BindgenGetExtern() {
     return &FLECS_IDEcsCounterID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsCounterIdID__BindgenGetExtern() {
     return &FLECS_IDEcsCounterIdID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsCounterIncrementID__BindgenGetExtern() {
     return &FLECS_IDEcsCounterIncrementID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsDefaultChildComponentID__BindgenGetExtern() {
     return &FLECS_IDEcsDefaultChildComponentID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsDocDescriptionID__BindgenGetExtern() {
     return &FLECS_IDEcsDocDescriptionID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsEnumID__BindgenGetExtern() {
     return &FLECS_IDEcsEnumID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsGaugeID__BindgenGetExtern() {
     return &FLECS_IDEcsGaugeID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsIdentifierID__BindgenGetExtern() {
     return &FLECS_IDEcsIdentifierID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsMemberID__BindgenGetExtern() {
     return &FLECS_IDEcsMemberID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsMemberRangesID__BindgenGetExtern() {
     return &FLECS_IDEcsMemberRangesID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsMetricID__BindgenGetExtern() {
     return &FLECS_IDEcsMetricID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsMetricInstanceID__BindgenGetExtern() {
     return &FLECS_IDEcsMetricInstanceID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsMetricSourceID__BindgenGetExtern() {
     return &FLECS_IDEcsMetricSourceID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsMetricValueID__BindgenGetExtern() {
     return &FLECS_IDEcsMetricValueID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsOpaqueID__BindgenGetExtern() {
     return &FLECS_IDEcsOpaqueID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsPipelineID__BindgenGetExtern() {
     return &FLECS_IDEcsPipelineID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsPipelineStatsID__BindgenGetExtern() {
     return &FLECS_IDEcsPipelineStatsID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsPolyID__BindgenGetExtern() {
     return &FLECS_IDEcsPolyID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsPrimitiveID__BindgenGetExtern() {
     return &FLECS_IDEcsPrimitiveID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsRateFilterID__BindgenGetExtern() {
     return &FLECS_IDEcsRateFilterID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsRestID__BindgenGetExtern() {
     return &FLECS_IDEcsRestID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsScriptConstVarID__BindgenGetExtern() {
     return &FLECS_IDEcsScriptConstVarID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsScriptFunctionID__BindgenGetExtern() {
     return &FLECS_IDEcsScriptFunctionID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsScriptID__BindgenGetExtern() {
     return &FLECS_IDEcsScriptID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsScriptMethodID__BindgenGetExtern() {
     return &FLECS_IDEcsScriptMethodID_;
-}
+}
+BINDGEN_API void* FLECS_IDEcsScriptRngID__BindgenGetExtern() {
+    return &FLECS_IDEcsScriptRngID_;
+}
 BINDGEN_API void* FLECS_IDEcsScriptTemplateID__BindgenGetExtern() {
     return &FLECS_IDEcsScriptTemplateID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsStructID__BindgenGetExtern() {
     return &FLECS_IDEcsStructID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsSystemStatsID__BindgenGetExtern() {
     return &FLECS_IDEcsSystemStatsID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsTickSourceID__BindgenGetExtern() {
     return &FLECS_IDEcsTickSourceID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsTimerID__BindgenGetExtern() {
     return &FLECS_IDEcsTimerID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsTypeID__BindgenGetExtern() {
     return &FLECS_IDEcsTypeID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsTypeSerializerID__BindgenGetExtern() {
     return &FLECS_IDEcsTypeSerializerID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsUnitID__BindgenGetExtern() {
     return &FLECS_IDEcsUnitID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsUnitPrefixID__BindgenGetExtern() {
     return &FLECS_IDEcsUnitPrefixID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsVectorID__BindgenGetExtern() {
     return &FLECS_IDEcsVectorID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsWorldStatsID__BindgenGetExtern() {
     return &FLECS_IDEcsWorldStatsID_;
-}
+}
 BINDGEN_API void* FLECS_IDEcsWorldSummaryID__BindgenGetExtern() {
     return &FLECS_IDEcsWorldSummaryID_;
-}
+}
 BINDGEN_API void* FLECS_IDFlecsAlertsID__BindgenGetExtern() {
     return &FLECS_IDFlecsAlertsID_;
-}
+}
 BINDGEN_API void* FLECS_IDFlecsMetricsID__BindgenGetExtern() {
     return &FLECS_IDFlecsMetricsID_;
-}
+}
 BINDGEN_API void* FLECS_IDFlecsStatsID__BindgenGetExtern() {
     return &FLECS_IDFlecsStatsID_;
-}
+}
diff --git a/src/Flecs.NET.Bindgen/Flecs.NET.Bindgen.csproj b/src/Flecs.NET.Bindgen/Flecs.NET.Bindgen.csproj
index 6c1fa754..34a857c3 100644
--- a/src/Flecs.NET.Bindgen/Flecs.NET.Bindgen.csproj
+++ b/src/Flecs.NET.Bindgen/Flecs.NET.Bindgen.csproj
@@ -1,34 +1,36 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <ContinuousIntegrationBuild>false</ContinuousIntegrationBuild>
-        <Deterministic>false</Deterministic>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
-        <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Bindgen.NET" Version="0.1.17"/>
-        <PackageReference Include="Vezel.Zig.Toolsets.$(HostRuntime)" Version="0.13.0.1">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-    </ItemGroup>
-
-    <!-- Store the location of the zig lib folder as a global variable that can be accessed in code. -->
-    <ItemGroup>
-        <Compile Include="$(IntermediateOutputPath)BuildConstants.cs"/>
-    </ItemGroup>
-
-    <Target Name="GenerateConstants" BeforeTargets="CoreCompile">
-        <WriteLinesToFile
-            File="$(IntermediateOutputPath)BuildConstants.cs"
-            Lines='public static class BuildConstants { public const string ZigLibPath = @"$(ZigLibPath)"%3B }'
-            Overwrite="true"/>
-    </Target>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>exe</OutputType>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <ContinuousIntegrationBuild>false</ContinuousIntegrationBuild>
+        <Deterministic>false</Deterministic>
+        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
+        <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Bindgen.NET" Version="0.1.17" />
+        <PackageReference Include="Vezel.Zig.Toolsets.$(HostRuntime)" Version="0.13.0.1">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <!-- Store the location of the zig lib folder as a global variable that can be accessed in code. -->
+    <ItemGroup>
+        <Compile Include="$(IntermediateOutputPath)BuildConstants.cs" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Update="bootstrap.h">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+
+    <Target Name="GenerateConstants" BeforeTargets="CoreCompile">
+        <WriteLinesToFile File="$(IntermediateOutputPath)BuildConstants.cs" Lines="public static class BuildConstants { public const string ZigLibPath = @&quot;$(ZigLibPath)&quot;%3B }" Overwrite="true" />
+    </Target>
+
+</Project>
diff --git a/src/Flecs.NET.Bindgen/Program.cs b/src/Flecs.NET.Bindgen/Program.cs
index e73a7e59..7ed23d9f 100644
--- a/src/Flecs.NET.Bindgen/Program.cs
+++ b/src/Flecs.NET.Bindgen/Program.cs
@@ -1,51 +1,51 @@
-using System.Runtime.CompilerServices;
-using Bindgen.NET;
-
-BindingOptions bindingOptions = new()
-{
-    Namespace = "Flecs.NET.Bindings",
-    Class = "flecs",
-
-    DllImportPath = "flecs",
-
-    SuppressedWarnings = { "CS8981" },
-
-    SystemIncludeDirectories = { Path.Combine(BuildConstants.ZigLibPath, "include") },
-    IncludeDirectories = { GetFlecsIncludePath() },
-
-    InputFile = GetFlecsHeaderPath(),
-    OutputFile = GetBindingsOutputPath(),
-    NativeOutputFile = GetBindingsHelperOutputPath(),
-
-    GenerateExternVariables = true,
-    GenerateDisableRuntimeMarshallingAttribute = true,
-
-    Ignored = {"FLECS_IDEcsPipelineQueryID_"}
-};
-
-if (OperatingSystem.IsMacOS())
-    bindingOptions.SystemIncludeDirectories.Add(Path.Combine(BuildConstants.ZigLibPath, "libc", "include", "any-macos-any"));
-
-BindingGenerator.Generate(bindingOptions);
-
-return;
-
-string GetFlecsIncludePath([CallerFilePath] string filePath = "")
-{
-    return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs", "include"));
-}
-
-string GetFlecsHeaderPath([CallerFilePath] string filePath = "")
-{
-    return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs", "include", "flecs.h"));
-}
-
-string GetBindingsOutputPath([CallerFilePath] string filePath = "")
-{
-    return Path.GetFullPath(Path.Combine(filePath, "..", "..", "Flecs.NET.Bindings", "Flecs.g.cs"));
-}
-
-string GetBindingsHelperOutputPath([CallerFilePath] string filePath = "")
-{
-    return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs_helpers.c"));
-}
+using System.Runtime.CompilerServices;
+using Bindgen.NET;
+
+BindingOptions bindingOptions = new()
+{
+    Namespace = "Flecs.NET.Bindings",
+    Class = "flecs",
+
+    DllImportPath = "flecs",
+
+    SuppressedWarnings = { "CS8981" },
+
+    SystemIncludeDirectories = { Path.Combine(BuildConstants.ZigLibPath, "include") },
+    IncludeDirectories = { GetFlecsIncludePath() },
+
+    InputFile = GetFlecsHeaderPath(),
+    OutputFile = GetBindingsOutputPath(),
+    NativeOutputFile = GetBindingsHelperOutputPath(),
+
+    GenerateExternVariables = true,
+    GenerateDisableRuntimeMarshallingAttribute = true,
+
+    Ignored = {"FLECS_IDEcsPipelineQueryID_"}
+};
+
+if (OperatingSystem.IsMacOS())
+    bindingOptions.SystemIncludeDirectories.Add(Path.Combine(BuildConstants.ZigLibPath, "libc", "include", "any-macos-any"));
+
+BindingGenerator.Generate(bindingOptions);
+
+return;
+
+string GetFlecsIncludePath([CallerFilePath] string filePath = "")
+{
+    return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs", "include"));
+}
+
+string GetFlecsHeaderPath([CallerFilePath] string filePath = "")
+{
+    return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Environment.ProcessPath!)!, "bootstrap.h"));
+}
+
+string GetBindingsOutputPath([CallerFilePath] string filePath = "")
+{
+    return Path.GetFullPath(Path.Combine(filePath, "..", "..", "Flecs.NET.Bindings", "Flecs.g.cs"));
+}
+
+string GetBindingsHelperOutputPath([CallerFilePath] string filePath = "")
+{
+    return Path.GetFullPath(Path.Combine(filePath, "..", "..", "..", "native", "flecs_helpers.c"));
+}
diff --git a/src/Flecs.NET.Bindgen/bootstrap.h b/src/Flecs.NET.Bindgen/bootstrap.h
new file mode 100644
index 00000000..f8860d54
--- /dev/null
+++ b/src/Flecs.NET.Bindgen/bootstrap.h
@@ -0,0 +1,3 @@
+#define FLECS_SCRIPT_MATH
+
+#include <flecs.h>
\ No newline at end of file
diff --git a/src/Flecs.NET.Bindings/Flecs.g.cs b/src/Flecs.NET.Bindings/Flecs.g.cs
index af35eccf..5cece7f3 100644
--- a/src/Flecs.NET.Bindings/Flecs.g.cs
+++ b/src/Flecs.NET.Bindings/Flecs.g.cs
@@ -223,6 +223,12 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_enum_init")]
     public static extern ulong ecs_enum_init(ecs_world_t* world, ecs_enum_desc_t* desc);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_exclusive_access_begin")]
+    public static extern void ecs_exclusive_access_begin(ecs_world_t* world, byte* thread_name);
+
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_exclusive_access_end")]
+    public static extern void ecs_exclusive_access_end(ecs_world_t* world, bool lock_world);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_exists")]
     public static extern bool ecs_exists(ecs_world_t* world, ulong entity);
 
@@ -322,9 +328,15 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_get_mut_id")]
     public static extern void* ecs_get_mut_id(ecs_world_t* world, ulong entity, ulong id);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_get_mut_modified_id")]
+    public static extern void* ecs_get_mut_modified_id(ecs_world_t* world, ulong entity, ulong id);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_get_name")]
     public static extern byte* ecs_get_name(ecs_world_t* world, ulong entity);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_get_ordered_children")]
+    public static extern ecs_entities_t ecs_get_ordered_children(ecs_world_t* world, ulong parent);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_get_parent")]
     public static extern ulong ecs_get_parent(ecs_world_t* world, ulong entity);
 
@@ -424,6 +436,9 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_id_in_use")]
     public static extern bool ecs_id_in_use(ecs_world_t* world, ulong id);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_id_is_any")]
+    public static extern bool ecs_id_is_any(ulong id);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_id_is_pair")]
     public static extern bool ecs_id_is_pair(ulong id);
 
@@ -487,6 +502,9 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_first")]
     public static extern ulong ecs_iter_first(ecs_iter_t* it);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_get_group")]
+    public static extern ulong ecs_iter_get_group(ecs_iter_t* it);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_get_var")]
     public static extern ulong ecs_iter_get_var(ecs_iter_t* it, int var_id);
 
@@ -496,6 +514,15 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_get_var_as_table")]
     public static extern ecs_table_t* ecs_iter_get_var_as_table(ecs_iter_t* it, int var_id);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_get_var_count")]
+    public static extern int ecs_iter_get_var_count(ecs_iter_t* it);
+
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_get_var_name")]
+    public static extern byte* ecs_iter_get_var_name(ecs_iter_t* it, int var_id);
+
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_get_vars")]
+    public static extern ecs_var_t* ecs_iter_get_vars(ecs_iter_t* it);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_iter_is_true")]
     public static extern bool ecs_iter_is_true(ecs_iter_t* it);
 
@@ -1186,6 +1213,9 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_set_binding_ctx")]
     public static extern void ecs_set_binding_ctx(ecs_world_t* world, void* ctx, delegate* unmanaged<void*, void> ctx_free);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_set_child_order")]
+    public static extern void ecs_set_child_order(ecs_world_t* world, ulong parent, ulong* children, int child_count);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_set_ctx")]
     public static extern void ecs_set_ctx(ecs_world_t* world, void* ctx, delegate* unmanaged<void*, void> ctx_free);
 
@@ -1261,6 +1291,9 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_should_quit")]
     public static extern bool ecs_should_quit(ecs_world_t* world);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_shrink")]
+    public static extern void ecs_shrink(ecs_world_t* world);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_sleepf")]
     public static extern void ecs_sleepf(double t);
 
@@ -1588,6 +1621,9 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_vec_remove_last")]
     public static extern void ecs_vec_remove_last(ecs_vec_t* vec);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_vec_remove_ordered")]
+    public static extern void ecs_vec_remove_ordered(ecs_vec_t* v, int size, int index);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ecs_vec_reset")]
     public static extern ecs_vec_t* ecs_vec_reset(ecs_allocator_t* allocator, ecs_vec_t* vec, int size);
 
@@ -1711,17 +1747,29 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_brealloc_w_dbg_info")]
     public static extern void* flecs_brealloc_w_dbg_info(ecs_block_allocator_t* dst, ecs_block_allocator_t* src, void* memory, byte* type_name);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_check_exclusive_world_access_read")]
+    public static extern void flecs_check_exclusive_world_access_read(ecs_world_t* world);
+
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_check_exclusive_world_access_write")]
+    public static extern void flecs_check_exclusive_world_access_write(ecs_world_t* world);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_chresc")]
     public static extern byte* flecs_chresc(byte* @out, byte @in, byte delimiter);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_chrparse")]
     public static extern byte* flecs_chrparse(byte* @in, byte* @out);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_get_id")]
+    public static extern ulong flecs_component_get_id(ecs_component_record_t* cr);
+
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_get_table")]
+    public static extern ecs_table_record_t* flecs_component_get_table(ecs_component_record_t* cr, ecs_table_t* table);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_ids_get")]
     public static extern ulong flecs_component_ids_get(ecs_world_t* world, int index);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_ids_get_alive")]
-    public static extern ulong flecs_component_ids_get_alive(ecs_world_t* stage_world, int index);
+    public static extern ulong flecs_component_ids_get_alive(ecs_world_t* world, int index);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_ids_index_get")]
     public static extern int flecs_component_ids_index_get();
@@ -1729,8 +1777,17 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_ids_set")]
     public static extern void flecs_component_ids_set(ecs_world_t* world, int index, ulong id);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_iter")]
+    public static extern bool flecs_component_iter(ecs_component_record_t* cr, ecs_table_cache_iter_t* iter_out);
+
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_component_next")]
+    public static extern ecs_table_record_t* flecs_component_next(ecs_table_cache_iter_t* iter);
+
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_components_get")]
+    public static extern ecs_component_record_t* flecs_components_get(ecs_world_t* world, ulong id);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_default_ctor")]
-    public static extern void flecs_default_ctor(void* ptr, int count, ecs_type_info_t* ctx);
+    public static extern void flecs_default_ctor(void* ptr, int count, ecs_type_info_t* type_info);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_dump_backtrace")]
     public static extern void flecs_dump_backtrace(void* stream);
@@ -1774,9 +1831,6 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_hm_bucket_remove")]
     public static extern void flecs_hm_bucket_remove(ecs_hashmap_t* map, ecs_hm_bucket_t* bucket, ulong hash, int index);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_identifier_is_0")]
-    public static extern bool flecs_identifier_is_0(byte* id);
-
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_module_path_from_c")]
     public static extern byte* flecs_module_path_from_c(byte* c_name);
 
@@ -1798,6 +1852,9 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_poly_release_")]
     public static extern int flecs_poly_release_(void* poly);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_query_trivial_cached_next")]
+    public static extern bool flecs_query_trivial_cached_next(ecs_iter_t* it);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_resume_readonly")]
     public static extern void flecs_resume_readonly(ecs_world_t* world, ecs_suspend_readonly_state_t* state);
 
@@ -1811,7 +1868,7 @@ public partial class BindgenInternal
     public static extern int flecs_sparse_count(ecs_sparse_t* sparse);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_ensure")]
-    public static extern void* flecs_sparse_ensure(ecs_sparse_t* sparse, int elem_size, ulong id);
+    public static extern void* flecs_sparse_ensure(ecs_sparse_t* sparse, int elem_size, ulong id, bool* is_new);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_ensure_fast")]
     public static extern void* flecs_sparse_ensure_fast(ecs_sparse_t* sparse, int elem_size, ulong id);
@@ -1822,18 +1879,21 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_get")]
     public static extern void* flecs_sparse_get(ecs_sparse_t* sparse, int elem_size, ulong id);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_get_any")]
-    public static extern void* flecs_sparse_get_any(ecs_sparse_t* sparse, int elem_size, ulong id);
-
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_get_dense")]
     public static extern void* flecs_sparse_get_dense(ecs_sparse_t* sparse, int elem_size, int index);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_has")]
+    public static extern bool flecs_sparse_has(ecs_sparse_t* sparse, ulong id);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_ids")]
     public static extern ulong* flecs_sparse_ids(ecs_sparse_t* sparse);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_init")]
     public static extern void flecs_sparse_init(ecs_sparse_t* result, ecs_allocator_t* allocator, ecs_block_allocator_t* page_allocator, int size);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_insert")]
+    public static extern void* flecs_sparse_insert(ecs_sparse_t* sparse, int elem_size, ulong id);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_is_alive")]
     public static extern bool flecs_sparse_is_alive(ecs_sparse_t* sparse, ulong id);
 
@@ -1844,13 +1904,13 @@ public partial class BindgenInternal
     public static extern ulong flecs_sparse_new_id(ecs_sparse_t* sparse);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_remove")]
-    public static extern void flecs_sparse_remove(ecs_sparse_t* sparse, int elem_size, ulong id);
+    public static extern bool flecs_sparse_remove(ecs_sparse_t* sparse, int size, ulong id);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_remove_fast")]
-    public static extern void* flecs_sparse_remove_fast(ecs_sparse_t* sparse, int size, ulong index);
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_remove_w_gen")]
+    public static extern bool flecs_sparse_remove_w_gen(ecs_sparse_t* sparse, int size, ulong id);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_try")]
-    public static extern void* flecs_sparse_try(ecs_sparse_t* sparse, int elem_size, ulong id);
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_sparse_shrink")]
+    public static extern void flecs_sparse_shrink(ecs_sparse_t* sparse);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_stack_alloc")]
     public static extern void* flecs_stack_alloc(ecs_stack_t* stack, int size, int align);
@@ -1888,32 +1948,20 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_suspend_readonly")]
     public static extern ecs_world_t* flecs_suspend_readonly(ecs_world_t* world, ecs_suspend_readonly_state_t* state);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_fini")]
-    public static extern void flecs_switch_fini(ecs_switch_t* sw);
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_table_id")]
+    public static extern ulong flecs_table_id(ecs_table_t* table);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_first")]
-    public static extern uint flecs_switch_first(ecs_switch_t* sw, ulong value);
-
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_get")]
-    public static extern ulong flecs_switch_get(ecs_switch_t* sw, uint element);
-
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_init")]
-    public static extern void flecs_switch_init(ecs_switch_t* sw, ecs_allocator_t* allocator);
-
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_next")]
-    public static extern uint flecs_switch_next(ecs_switch_t* sw, uint previous);
-
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_reset")]
-    public static extern bool flecs_switch_reset(ecs_switch_t* sw, uint element);
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_table_observed_count")]
+    public static extern int flecs_table_observed_count(ecs_table_t* table);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_set")]
-    public static extern bool flecs_switch_set(ecs_switch_t* sw, uint element, ulong value);
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_table_record_get_component")]
+    public static extern ecs_component_record_t* flecs_table_record_get_component(ecs_table_record_t* tr);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_switch_targets")]
-    public static extern ecs_map_iter_t flecs_switch_targets(ecs_switch_t* sw);
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_table_records")]
+    public static extern ecs_table_records_t flecs_table_records(ecs_table_t* table);
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_table_observed_count")]
-    public static extern int flecs_table_observed_count(ecs_table_t* table);
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_table_traverse_add")]
+    public static extern ecs_table_t* flecs_table_traverse_add(ecs_world_t* world, ecs_table_t* table, ulong* id_ptr, ecs_table_diff_t* diff);
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "flecs_to_snake_case")]
     public static extern byte* flecs_to_snake_case(byte* str);
@@ -1942,6 +1990,9 @@ public partial class BindgenInternal
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "FlecsScriptImport")]
     public static extern void FlecsScriptImport(ecs_world_t* world);
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "FlecsScriptMathImport")]
+    public static extern void FlecsScriptMathImport(ecs_world_t* world);
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "FlecsStatsImport")]
     public static extern void FlecsStatsImport(ecs_world_t* world);
 
@@ -2251,17 +2302,17 @@ public partial struct ecs_sparse_t
 
     public partial struct ecs_block_allocator_t
     {
-        public ecs_block_allocator_chunk_header_t* head;
-
-        public ecs_block_allocator_block_t* block_head;
+        public int data_size;
 
         public int chunk_size;
 
-        public int data_size;
-
         public int chunks_per_block;
 
-        public int block_size;
+        public int block_size;
+
+        public ecs_block_allocator_chunk_header_t* head;
+
+        public ecs_block_allocator_block_t* block_head;
     }
 
     public partial struct ecs_map_t
@@ -2356,27 +2407,6 @@ public partial struct ecs_map_params_t
         public ecs_block_allocator_t entry_allocator;
     }
 
-    public partial struct ecs_switch_node_t
-    {
-        public uint next;
-
-        public uint prev;
-    }
-
-    public partial struct ecs_switch_page_t
-    {
-        public ecs_vec_t nodes;
-
-        public ecs_vec_t values;
-    }
-
-    public partial struct ecs_switch_t
-    {
-        public ecs_map_t hdrs;
-
-        public ecs_vec_t pages;
-    }
-
     public partial struct ecs_strbuf_list_elem
     {
         public int count;
@@ -2539,11 +2569,13 @@ public partial struct ecs_query_t
     {
         public ecs_header_t hdr;
 
-        public InlineArrays.ecs_term_t_32 terms;
+        public ecs_term_t* terms;
+
+        public int* sizes;
 
-        public InlineArrays.int_32 sizes;
+        public ulong* ids;
 
-        public InlineArrays.ulong_32 ids;
+        public ulong bloom_filter;
 
         public uint flags;
 
@@ -2642,8 +2674,16 @@ public partial struct ecs_iter_t
 
         public ecs_world_t* real_world;
 
+        public int offset;
+
+        public int count;
+
         public ulong* entities;
 
+        public void** ptrs;
+
+        public ecs_table_record_t** trs;
+
         public int* sizes;
 
         public ecs_table_t* table;
@@ -2652,16 +2692,10 @@ public partial struct ecs_iter_t
 
         public ulong* ids;
 
-        public ecs_var_t* variables;
-
-        public ecs_table_record_t** trs;
-
         public ulong* sources;
 
         public ulong constrained_vars;
 
-        public ulong group_id;
-
         public uint set_fields;
 
         public uint ref_fields;
@@ -2682,12 +2716,8 @@ public partial struct ecs_iter_t
 
         public byte term_index;
 
-        public byte variable_count;
-
         public ecs_query_t* query;
 
-        public byte** variable_names;
-
         public void* param;
 
         public void* ctx;
@@ -2704,10 +2734,6 @@ public partial struct ecs_iter_t
 
         public int frame_offset;
 
-        public int offset;
-
-        public int count;
-
         public uint flags;
 
         public ulong interrupted_by;
@@ -2731,7 +2757,9 @@ public partial struct ecs_ref_t
 
         public ulong table_id;
 
-        public uint table_version;
+        public uint table_version_fast;
+
+        public ushort table_version;
 
         public ecs_record_t* record;
 
@@ -2756,6 +2784,10 @@ public partial struct ecs_type_hooks_t
 
         public delegate* unmanaged<void*, void*, int, ecs_type_info_t*, void> move_dtor;
 
+        public delegate* unmanaged<void*, void*, ecs_type_info_t*, int> cmp;
+
+        public delegate* unmanaged<void*, void*, ecs_type_info_t*, bool> equals;
+
         public uint flags;
 
         public delegate* unmanaged<ecs_iter_t*, void> on_add;
@@ -2792,7 +2824,7 @@ public partial struct ecs_type_info_t
 
     public partial struct ecs_record_t
     {
-        public ecs_id_record_t* idr;
+        public ecs_component_record_t* cr;
 
         public ecs_table_t* table;
 
@@ -2801,7 +2833,7 @@ public partial struct ecs_record_t
         public int dense;
     }
 
-    public partial struct ecs_id_record_t
+    public partial struct ecs_component_record_t
     {
     }
 
@@ -2811,8 +2843,6 @@ public partial struct ecs_mixins_t
 
     public partial struct ecs_header_t
     {
-        public int magic;
-
         public int type;
 
         public int refcount;
@@ -2820,21 +2850,6 @@ public partial struct ecs_header_t
         public ecs_mixins_t* mixins;
     }
 
-    public partial struct ecs_table_cache_hdr_t
-    {
-        public ecs_table_cache_t* cache;
-
-        public ecs_table_t* table;
-
-        public ecs_table_cache_hdr_t* prev;
-
-        public ecs_table_cache_hdr_t* next;
-    }
-
-    public partial struct ecs_table_cache_t
-    {
-    }
-
     public partial struct ecs_table_record_t
     {
         public ecs_table_cache_hdr_t hdr;
@@ -2857,7 +2872,11 @@ public partial struct ecs_data_t
     {
     }
 
-    public partial struct ecs_query_cache_table_match_t
+    public partial struct ecs_query_cache_match_t
+    {
+    }
+
+    public partial struct ecs_query_cache_group_t
     {
     }
 
@@ -2921,6 +2940,17 @@ public partial struct ecs_table_cache_iter_t
         public bool iter_empty;
     }
 
+    public partial struct ecs_table_cache_hdr_t
+    {
+        public ecs_table_cache_t* cache;
+
+        public ecs_table_t* table;
+
+        public ecs_table_cache_hdr_t* prev;
+
+        public ecs_table_cache_hdr_t* next;
+    }
+
     public partial struct ecs_each_iter_t
     {
         public ecs_table_cache_iter_t it;
@@ -2943,8 +2973,6 @@ public partial struct ecs_query_op_profile_t
 
     public partial struct ecs_query_iter_t
     {
-        public ecs_query_t* query;
-
         public ecs_var_t* vars;
 
         public ecs_query_var_t* query_vars;
@@ -2953,21 +2981,25 @@ public partial struct ecs_query_iter_t
 
         public ecs_query_op_ctx_t* op_ctx;
 
-        public ecs_query_cache_table_match_t* node;
+        public ulong* written;
+
+        public ecs_query_cache_group_t* group;
 
-        public ecs_query_cache_table_match_t* prev;
+        public ecs_vec_t* tables;
 
-        public ecs_query_cache_table_match_t* last;
+        public ecs_vec_t* all_tables;
 
-        public ulong* written;
+        public ecs_query_cache_match_t* elem;
 
-        public int skip_count;
+        public int cur;
+
+        public int all_cur;
 
         public ecs_query_op_profile_t* profile;
 
         public short op;
 
-        public short sp;
+        public bool iter_single_group;
     }
 
     public partial struct ecs_query_var_t
@@ -2982,28 +3014,19 @@ public partial struct ecs_query_op_ctx_t
     {
     }
 
-    public partial struct ecs_iter_cache_t
-    {
-        public ecs_stack_cursor_t* stack_cursor;
-
-        public byte used;
-
-        public byte allocated;
-    }
-
     public partial struct ecs_iter_private_t
     {
-        public ecs_iter_private_t.AnonymousRecord_api_types_L153_C5 iter;
+        public ecs_iter_private_t.AnonymousRecord_api_types_L143_C5 iter;
 
         public void* entity_iter;
 
-        public ecs_iter_cache_t cache;
+        public ecs_stack_cursor_t* stack_cursor;
     }
 
     public partial struct ecs_iter_private_t
     {
         [StructLayout(System.Runtime.InteropServices.LayoutKind.Explicit)]
-        public partial struct AnonymousRecord_api_types_L153_C5
+        public partial struct AnonymousRecord_api_types_L143_C5
         {
             [System.Runtime.InteropServices.FieldOffset(0)]
             public ecs_query_iter_t query;
@@ -3091,6 +3114,28 @@ public partial struct flecs_hashmap_result_t
         public ulong hash;
     }
 
+    public partial struct ecs_table_cache_t
+    {
+    }
+
+    public partial struct ecs_table_diff_t
+    {
+        public ecs_type_t added;
+
+        public ecs_type_t removed;
+
+        public uint added_flags;
+
+        public uint removed_flags;
+    }
+
+    public partial struct ecs_table_records_t
+    {
+        public ecs_table_record_t* array;
+
+        public int count;
+    }
+
     public partial struct ecs_value_t
     {
         public ulong type;
@@ -3331,14 +3376,14 @@ public partial struct ecs_world_info_t
 
         public int table_count;
 
-        public ecs_world_info_t.AnonymousRecord_flecs_L1468_C5 cmd;
+        public ecs_world_info_t.AnonymousRecord_flecs_L1484_C5 cmd;
 
         public byte* name_prefix;
     }
 
     public partial struct ecs_world_info_t
     {
-        public partial struct AnonymousRecord_flecs_L1468_C5
+        public partial struct AnonymousRecord_flecs_L1484_C5
         {
             public long add_count;
 
@@ -3368,6 +3413,8 @@ public partial struct AnonymousRecord_flecs_L1468_C5
 
     public partial struct ecs_query_group_info_t
     {
+        public ulong id;
+
         public int match_count;
 
         public int table_count;
@@ -3429,9 +3476,7 @@ public partial struct ecs_query_count_t
 
         public int entities;
 
-        public int tables;
-
-        public int empty_tables;
+        public int tables;
     }
 
     public partial struct ecs_app_desc_t
@@ -3622,8 +3667,6 @@ public partial struct ecs_system_t
 
         public ecs_query_t* query;
 
-        public ulong query_entity;
-
         public ulong tick_source;
 
         public bool multi_threaded;
@@ -3650,10 +3693,6 @@ public partial struct ecs_system_t
 
         public long last_frame;
 
-        public ecs_world_t* world;
-
-        public ulong entity;
-
         public delegate* unmanaged<void*, void> dtor;
     }
 
@@ -4166,6 +4205,13 @@ public partial struct ecs_world_to_json_desc_t
         public bool serialize_modules;
     }
 
+    public partial struct EcsScriptRng
+    {
+        public ulong seed;
+
+        public void* impl;
+    }
+
     public partial struct ecs_script_template_t
     {
     }
@@ -4429,7 +4475,9 @@ public partial struct EcsEnum
     {
         public ulong underlying_type;
 
-        public ecs_map_t constants;
+        public ecs_map_t constants;
+
+        public ecs_vec_t ordered_constants;
     }
 
     public partial struct ecs_bitmask_constant_t
@@ -4445,7 +4493,9 @@ public partial struct ecs_bitmask_constant_t
 
     public partial struct EcsBitmask
     {
-        public ecs_map_t constants;
+        public ecs_map_t constants;
+
+        public ecs_vec_t ordered_constants;
     }
 
     public partial struct EcsArray
@@ -4477,6 +4527,10 @@ public partial struct EcsOpaque
 
         public delegate* unmanaged<ecs_serializer_t*, void*, int> serialize;
 
+        public delegate* unmanaged<ecs_serializer_t*, void*, byte*, int> serialize_member;
+
+        public delegate* unmanaged<ecs_serializer_t*, void*, ulong, int> serialize_element;
+
         public delegate* unmanaged<void*, bool, void> assign_bool;
 
         public delegate* unmanaged<void*, byte, void> assign_char;
@@ -4706,17 +4760,17 @@ public partial struct byte_512
 
     public partial struct InlineArrays
     {
-        [InlineArray(32)]
-        public partial struct ecs_term_t_32
+        [InlineArray(8)]
+        public partial struct ulong_8
         {
-            public ecs_term_t Item0;
+            public ulong Item0;
         }
     }
 
     public partial struct InlineArrays
     {
-        [InlineArray(32)]
-        public partial struct int_32
+        [InlineArray(2)]
+        public partial struct int_2
         {
             public int Item0;
         }
@@ -4724,17 +4778,17 @@ public partial struct int_32
 
     public partial struct InlineArrays
     {
-        [InlineArray(32)]
-        public partial struct ulong_32
+        [InlineArray(2)]
+        public partial struct ecs_commands_t_2
         {
-            public ulong Item0;
+            public ecs_commands_t Item0;
         }
     }
 
     public partial struct InlineArrays
     {
-        [InlineArray(8)]
-        public partial struct ulong_8
+        [InlineArray(32)]
+        public partial struct ulong_32
         {
             public ulong Item0;
         }
@@ -4742,19 +4796,10 @@ public partial struct ulong_8
 
     public partial struct InlineArrays
     {
-        [InlineArray(2)]
-        public partial struct int_2
-        {
-            public int Item0;
-        }
-    }
-
-    public partial struct InlineArrays
-    {
-        [InlineArray(2)]
-        public partial struct ecs_commands_t_2
+        [InlineArray(32)]
+        public partial struct ecs_term_t_32
         {
-            public ecs_commands_t Item0;
+            public ecs_term_t Item0;
         }
     }
 
@@ -4977,8 +5022,6 @@ public partial struct ecs_member_t_32
 
     public const uint ECS_ROW_MASK = 268435455;
 
-    public const int ECS_STACK_PAGE_SIZE = 4096;
-
     public const int ecs_stage_t_magic = 1701016435;
 
     public const int ECS_STAT_WINDOW = 60;
@@ -4987,41 +5030,49 @@ public partial struct ecs_member_t_32
 
     public const int ECS_STRBUF_SMALL_STRING_SIZE = 512;
 
-    public const int ECS_TYPE_HOOK_COPY = 4;
+    public const uint ECS_TYPE_HOOK_CMP = 256;
+
+    public const uint ECS_TYPE_HOOK_CMP_ILLEGAL = 524288;
 
-    public const int ECS_TYPE_HOOK_COPY_CTOR = 16;
+    public const uint ECS_TYPE_HOOK_COPY = 4;
 
-    public const int ECS_TYPE_HOOK_COPY_CTOR_ILLEGAL = 4096;
+    public const uint ECS_TYPE_HOOK_COPY_CTOR = 16;
 
-    public const int ECS_TYPE_HOOK_COPY_ILLEGAL = 1024;
+    public const uint ECS_TYPE_HOOK_COPY_CTOR_ILLEGAL = 32768;
 
-    public const int ECS_TYPE_HOOK_CTOR = 1;
+    public const uint ECS_TYPE_HOOK_COPY_ILLEGAL = 8192;
 
-    public const int ECS_TYPE_HOOK_CTOR_ILLEGAL = 256;
+    public const uint ECS_TYPE_HOOK_CTOR = 1;
 
-    public const int ECS_TYPE_HOOK_CTOR_MOVE_DTOR = 64;
+    public const uint ECS_TYPE_HOOK_CTOR_ILLEGAL = 1024;
 
-    public const int ECS_TYPE_HOOK_CTOR_MOVE_DTOR_ILLEGAL = 16384;
+    public const uint ECS_TYPE_HOOK_CTOR_MOVE_DTOR = 64;
 
-    public const int ECS_TYPE_HOOK_DTOR = 2;
+    public const uint ECS_TYPE_HOOK_CTOR_MOVE_DTOR_ILLEGAL = 131072;
 
-    public const int ECS_TYPE_HOOK_DTOR_ILLEGAL = 512;
+    public const uint ECS_TYPE_HOOK_DTOR = 2;
 
-    public const int ECS_TYPE_HOOK_MOVE = 8;
+    public const uint ECS_TYPE_HOOK_DTOR_ILLEGAL = 4096;
 
-    public const int ECS_TYPE_HOOK_MOVE_CTOR = 32;
+    public const uint ECS_TYPE_HOOK_EQUALS = 512;
 
-    public const int ECS_TYPE_HOOK_MOVE_CTOR_ILLEGAL = 8192;
+    public const uint ECS_TYPE_HOOK_EQUALS_ILLEGAL = 1048576;
 
-    public const int ECS_TYPE_HOOK_MOVE_DTOR = 128;
+    public const uint ECS_TYPE_HOOK_MOVE = 8;
 
-    public const int ECS_TYPE_HOOK_MOVE_DTOR_ILLEGAL = 32768;
+    public const uint ECS_TYPE_HOOK_MOVE_CTOR = 32;
 
-    public const int ECS_TYPE_HOOK_MOVE_ILLEGAL = 2048;
+    public const uint ECS_TYPE_HOOK_MOVE_CTOR_ILLEGAL = 65536;
 
-    public const int ECS_TYPE_HOOKS = 255;
+    public const uint ECS_TYPE_HOOK_MOVE_DTOR = 128;
 
-    public const int ECS_TYPE_HOOKS_ILLEGAL = 65280;
+    public const uint ECS_TYPE_HOOK_MOVE_DTOR_ILLEGAL = 262144;
+
+    public const uint ECS_TYPE_HOOK_MOVE_ILLEGAL = 16384;
+
+    public const uint ECS_TYPE_HOOKS = 1023;
+
+    public const uint ECS_TYPE_HOOKS_ILLEGAL = 2094080;
 
     public const int ECS_UNSUPPORTED = 6;
 
@@ -5039,6 +5090,8 @@ public partial struct ecs_member_t_32
 
     public const ulong EcsDesc = 576460752303423488;
 
+    public const uint EcsEntityHasDontFragment = 268435456;
+
     public const uint EcsEntityIsId = 2147483648;
 
     public const uint EcsEntityIsTarget = 1073741824;
@@ -5055,7 +5108,9 @@ public partial struct ecs_member_t_32
 
     public const uint EcsIdCanToggle = 8192;
 
-    public const uint EcsIdEventMask = 31916032;
+    public const uint EcsIdDontFragment = 16777216;
+
+    public const uint EcsIdEventMask = 283574272;
 
     public const uint EcsIdExclusive = 512;
 
@@ -5075,25 +5130,25 @@ public partial struct ecs_member_t_32
 
     public const uint EcsIdIsTransitive = 16384;
 
-    public const uint EcsIdIsUnion = 16777216;
-
     public const uint EcsIdMarkedForDelete = 1073741824;
 
+    public const uint EcsIdMatchDontFragment = 33554432;
+
     public const uint EcsIdOnDeleteDelete = 2;
 
     public const uint EcsIdOnDeleteMask = 7;
 
-    public const uint EcsIdOnDeleteObjectDelete = 16;
+    public const uint EcsIdOnDeletePanic = 4;
 
-    public const uint EcsIdOnDeleteObjectMask = 56;
+    public const uint EcsIdOnDeleteRemove = 1;
 
-    public const uint EcsIdOnDeleteObjectPanic = 32;
+    public const uint EcsIdOnDeleteTargetDelete = 16;
 
-    public const uint EcsIdOnDeleteObjectRemove = 8;
+    public const uint EcsIdOnDeleteTargetMask = 56;
 
-    public const uint EcsIdOnDeletePanic = 4;
+    public const uint EcsIdOnDeleteTargetPanic = 32;
 
-    public const uint EcsIdOnDeleteRemove = 1;
+    public const uint EcsIdOnDeleteTargetRemove = 8;
 
     public const uint EcsIdOnInstantiateDontInherit = 256;
 
@@ -5103,6 +5158,8 @@ public partial struct ecs_member_t_32
 
     public const uint EcsIdOnInstantiateOverride = 64;
 
+    public const uint EcsIdOrderedChildren = 268435456;
+
     public const uint EcsIdTag = 2048;
 
     public const uint EcsIdTraversable = 1024;
@@ -5115,7 +5172,7 @@ public partial struct ecs_member_t_32
 
     public const ulong EcsIsVariable = 288230376151711744;
 
-    public const uint EcsIterCacheSearch = 32768;
+    public const uint EcsIterCached = 32768;
 
     public const uint EcsIterCppEach = 524288;
 
@@ -5129,9 +5186,11 @@ public partial struct ecs_member_t_32
 
     public const uint EcsIterIsValid = 1;
 
+    public const uint EcsIterMatchEmptyTables = 8;
+
     public const uint EcsIterNoData = 2;
 
-    public const uint EcsIterNoResults = 8;
+    public const uint EcsIterNoResults = 4;
 
     public const uint EcsIterProfile = 128;
 
@@ -5141,23 +5200,37 @@ public partial struct ecs_member_t_32
 
     public const uint EcsIterTrivialCached = 16384;
 
+    public const uint EcsIterTrivialChangeDetection = 32;
+
     public const uint EcsIterTrivialSearch = 256;
 
     public const uint EcsIterTrivialTest = 2048;
 
-    public const uint EcsObserverBypassQuery = 32;
+    public const uint EcsNonTrivialIdInherit = 4;
+
+    public const uint EcsNonTrivialIdNonFragmenting = 2;
+
+    public const uint EcsNonTrivialIdSparse = 1;
+
+    public const uint EcsObserverBypassQuery = 128;
+
+    public const uint EcsObserverIsDisabled = 32;
+
+    public const uint EcsObserverIsMonitor = 16;
+
+    public const uint EcsObserverIsMulti = 8;
 
-    public const uint EcsObserverIsDisabled = 8;
+    public const uint EcsObserverIsParentDisabled = 64;
 
-    public const uint EcsObserverIsMonitor = 4;
+    public const uint EcsObserverKeepAlive = 2048;
 
-    public const uint EcsObserverIsMulti = 2;
+    public const uint EcsObserverMatchDisabled = 4;
 
-    public const uint EcsObserverIsParentDisabled = 16;
+    public const uint EcsObserverMatchPrefab = 2;
 
-    public const uint EcsObserverYieldOnCreate = 64;
+    public const uint EcsObserverYieldOnCreate = 256;
 
-    public const uint EcsObserverYieldOnDelete = 128;
+    public const uint EcsObserverYieldOnDelete = 512;
 
     public const uint EcsOsApiHighResolutionTimer = 1;
 
@@ -5171,11 +5244,13 @@ public partial struct ecs_member_t_32
 
     public const uint EcsQueryCacheYieldEmptyTables = 134217728;
 
+    public const uint EcsQueryDetectChanges = 256;
+
     public const uint EcsQueryHasCacheable = 16777216;
 
-    public const uint EcsQueryHasCondSet = 65536;
+    public const uint EcsQueryHasChangeDetection = 4194304;
 
-    public const uint EcsQueryHasMonitor = 4194304;
+    public const uint EcsQueryHasCondSet = 65536;
 
     public const uint EcsQueryHasNonThisOutTerms = 2097152;
 
@@ -5209,15 +5284,19 @@ public partial struct ecs_member_t_32
 
     public const uint EcsQueryMatchWildcards = 16384;
 
-    public const uint EcsQueryNested = 268435456;
+    public const uint EcsQueryNested = 536870912;
 
     public const uint EcsQueryTableOnly = 128;
 
+    public const uint EcsQueryTrivialCache = 268435456;
+
     public const ulong EcsSelf = 9223372036854775808;
 
-    public const uint EcsTableAddEdgeFlags = 25231360;
+    public const uint EcsTableAddEdgeFlags = 8454144;
 
-    public const uint EcsTableEdgeFlags = 25362432;
+    public const uint EcsTableEdgeFlags = 8585216;
+
+    public const uint EcsTableEdgeReparent = 536870912;
 
     public const uint EcsTableHasAddActions = 328712;
 
@@ -5229,6 +5308,8 @@ public partial struct ecs_member_t_32
 
     public const uint EcsTableHasCtors = 1024;
 
+    public const uint EcsTableHasDontFragment = 16777216;
+
     public const uint EcsTableHasDtors = 2048;
 
     public const uint EcsTableHasIsA = 8;
@@ -5255,6 +5336,8 @@ public partial struct ecs_member_t_32
 
     public const uint EcsTableHasOnTableFill = 524288;
 
+    public const uint EcsTableHasOrderedChildren = 268435456;
+
     public const uint EcsTableHasOverrides = 32768;
 
     public const uint EcsTableHasPairs = 64;
@@ -5265,9 +5348,7 @@ public partial struct ecs_member_t_32
 
     public const uint EcsTableHasToggle = 16384;
 
-    public const uint EcsTableHasTraversable = 67108864;
-
-    public const uint EcsTableHasUnion = 16777216;
+    public const uint EcsTableHasTraversable = 134217728;
 
     public const uint EcsTableIsComplex = 8408064;
 
@@ -5279,7 +5360,11 @@ public partial struct ecs_member_t_32
 
     public const uint EcsTableNotQueryable = 512;
 
-    public const uint EcsTableRemoveEdgeFlags = 25296896;
+    public const uint EcsTableOverrideDontFragment = 33554432;
+
+    public const uint EcsTableRemoveEdgeFlags = 276955136;
+
+    public const uint EcsTermDontFragment = 16384;
 
     public const uint EcsTermIdInherited = 16;
 
@@ -5287,7 +5372,7 @@ public partial struct ecs_member_t_32
 
     public const uint EcsTermIsMember = 512;
 
-    public const uint EcsTermIsOr = 16384;
+    public const uint EcsTermIsOr = 8192;
 
     public const uint EcsTermIsScope = 256;
 
@@ -5297,8 +5382,6 @@ public partial struct ecs_member_t_32
 
     public const uint EcsTermIsTrivial = 32;
 
-    public const uint EcsTermIsUnion = 8192;
-
     public const uint EcsTermKeepAlive = 2048;
 
     public const uint EcsTermMatchAny = 1;
@@ -5337,7 +5420,7 @@ public partial struct ecs_member_t_32
 
     public const int FLECS_DAG_DEPTH_MAX = 128;
 
-    public const int FLECS_ENTITY_PAGE_BITS = 12;
+    public const int FLECS_ENTITY_PAGE_BITS = 10;
 
     public const int FLECS_EVENT_DESC_MAX = 8;
 
@@ -5347,18 +5430,6 @@ public partial struct ecs_member_t_32
 
     public const int FLECS_ID_DESC_MAX = 32;
 
-    public const int flecs_iter_cache_all = 255;
-
-    public const uint flecs_iter_cache_ids = 1;
-
-    public const uint flecs_iter_cache_ptrs = 8;
-
-    public const uint flecs_iter_cache_sources = 4;
-
-    public const uint flecs_iter_cache_trs = 2;
-
-    public const uint flecs_iter_cache_variables = 16;
-
     public const int FLECS_QUERY_SCOPE_NESTING_MAX = 8;
 
     public const int FLECS_QUERY_VARIABLE_COUNT_MAX = 64;
@@ -5369,19 +5440,23 @@ public partial struct ecs_member_t_32
 
     public const int FLECS_SPARSE_PAGE_SIZE = 64;
 
+    public const int FLECS_STACK_PAGE_OFFSET = 32;
+
+    public const int FLECS_STACK_PAGE_SIZE = 992;
+
     public const int FLECS_TERM_ARG_COUNT_MAX = 16;
 
     public const int FLECS_TERM_COUNT_MAX = 32;
 
     public const int FLECS_VARIABLE_COUNT_MAX = 64;
 
-    public const string FLECS_VERSION = "4.0.4";
+    public const string FLECS_VERSION = "4.1.0";
 
     public const int FLECS_VERSION_MAJOR = 4;
 
-    public const int FLECS_VERSION_MINOR = 0;
+    public const int FLECS_VERSION_MINOR = 1;
 
-    public const int FLECS_VERSION_PATCH = 4;
+    public const int FLECS_VERSION_PATCH = 0;
 
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "ECS_AUTO_OVERRIDE_BindgenGetExtern")]
     private static extern void* ECS_AUTO_OVERRIDE_BindgenGetExtern();
@@ -5590,6 +5665,9 @@ public partial struct ecs_member_t_32
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsDocUuid_BindgenGetExtern")]
     private static extern void* EcsDocUuid_BindgenGetExtern();
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsDontFragment_BindgenGetExtern")]
+    private static extern void* EcsDontFragment_BindgenGetExtern();
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsDontInherit_BindgenGetExtern")]
     private static extern void* EcsDontInherit_BindgenGetExtern();
 
@@ -5863,6 +5941,9 @@ public partial struct ecs_member_t_32
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsOnValidate_BindgenGetExtern")]
     private static extern void* EcsOnValidate_BindgenGetExtern();
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsOrderedChildren_BindgenGetExtern")]
+    private static extern void* EcsOrderedChildren_BindgenGetExtern();
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsOverride_BindgenGetExtern")]
     private static extern void* EcsOverride_BindgenGetExtern();
 
@@ -6025,9 +6106,6 @@ public partial struct ecs_member_t_32
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsTraversable_BindgenGetExtern")]
     private static extern void* EcsTraversable_BindgenGetExtern();
 
-    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsUnion_BindgenGetExtern")]
-    private static extern void* EcsUnion_BindgenGetExtern();
-
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "EcsUnitPrefixes_BindgenGetExtern")]
     private static extern void* EcsUnitPrefixes_BindgenGetExtern();
 
@@ -6235,6 +6313,9 @@ public partial struct ecs_member_t_32
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "FLECS_IDEcsScriptMethodID__BindgenGetExtern")]
     private static extern void* FLECS_IDEcsScriptMethodID__BindgenGetExtern();
 
+    [DllImport(BindgenInternal.DllImportPath, EntryPoint = "FLECS_IDEcsScriptRngID__BindgenGetExtern")]
+    private static extern void* FLECS_IDEcsScriptRngID__BindgenGetExtern();
+
     [DllImport(BindgenInternal.DllImportPath, EntryPoint = "FLECS_IDEcsScriptTemplateID__BindgenGetExtern")]
     private static extern void* FLECS_IDEcsScriptTemplateID__BindgenGetExtern();
 
@@ -6418,6 +6499,8 @@ public partial struct ecs_member_t_32
 
     private static void* EcsDocUuid_Ptr;
 
+    private static void* EcsDontFragment_Ptr;
+
     private static void* EcsDontInherit_Ptr;
 
     private static void* EcsDuration_Ptr;
@@ -6600,6 +6683,8 @@ public partial struct ecs_member_t_32
 
     private static void* EcsOnValidate_Ptr;
 
+    private static void* EcsOrderedChildren_Ptr;
+
     private static void* EcsOverride_Ptr;
 
     private static void* EcsPairIsTag_Ptr;
@@ -6708,8 +6793,6 @@ public partial struct ecs_member_t_32
 
     private static void* EcsTraversable_Ptr;
 
-    private static void* EcsUnion_Ptr;
-
     private static void* EcsUnitPrefixes_Ptr;
 
     private static void* EcsUri_Ptr;
@@ -6848,6 +6931,8 @@ public partial struct ecs_member_t_32
 
     private static void* FLECS_IDEcsScriptMethodID__Ptr;
 
+    private static void* FLECS_IDEcsScriptRngID__Ptr;
+
     private static void* FLECS_IDEcsScriptTemplateID__Ptr;
 
     private static void* FLECS_IDEcsStructID__Ptr;
@@ -7016,6 +7101,8 @@ public partial struct ecs_member_t_32
 
     public static ref ulong EcsDocUuid => ref *(ulong*)(EcsDocUuid_Ptr == null ? EcsDocUuid_Ptr = EcsDocUuid_BindgenGetExtern() : EcsDocUuid_Ptr);
 
+    public static ref ulong EcsDontFragment => ref *(ulong*)(EcsDontFragment_Ptr == null ? EcsDontFragment_Ptr = EcsDontFragment_BindgenGetExtern() : EcsDontFragment_Ptr);
+
     public static ref ulong EcsDontInherit => ref *(ulong*)(EcsDontInherit_Ptr == null ? EcsDontInherit_Ptr = EcsDontInherit_BindgenGetExtern() : EcsDontInherit_Ptr);
 
     public static ref ulong EcsDuration => ref *(ulong*)(EcsDuration_Ptr == null ? EcsDuration_Ptr = EcsDuration_BindgenGetExtern() : EcsDuration_Ptr);
@@ -7198,6 +7285,8 @@ public partial struct ecs_member_t_32
 
     public static ref ulong EcsOnValidate => ref *(ulong*)(EcsOnValidate_Ptr == null ? EcsOnValidate_Ptr = EcsOnValidate_BindgenGetExtern() : EcsOnValidate_Ptr);
 
+    public static ref ulong EcsOrderedChildren => ref *(ulong*)(EcsOrderedChildren_Ptr == null ? EcsOrderedChildren_Ptr = EcsOrderedChildren_BindgenGetExtern() : EcsOrderedChildren_Ptr);
+
     public static ref ulong EcsOverride => ref *(ulong*)(EcsOverride_Ptr == null ? EcsOverride_Ptr = EcsOverride_BindgenGetExtern() : EcsOverride_Ptr);
 
     public static ref ulong EcsPairIsTag => ref *(ulong*)(EcsPairIsTag_Ptr == null ? EcsPairIsTag_Ptr = EcsPairIsTag_BindgenGetExtern() : EcsPairIsTag_Ptr);
@@ -7306,8 +7395,6 @@ public partial struct ecs_member_t_32
 
     public static ref ulong EcsTraversable => ref *(ulong*)(EcsTraversable_Ptr == null ? EcsTraversable_Ptr = EcsTraversable_BindgenGetExtern() : EcsTraversable_Ptr);
 
-    public static ref ulong EcsUnion => ref *(ulong*)(EcsUnion_Ptr == null ? EcsUnion_Ptr = EcsUnion_BindgenGetExtern() : EcsUnion_Ptr);
-
     public static ref ulong EcsUnitPrefixes => ref *(ulong*)(EcsUnitPrefixes_Ptr == null ? EcsUnitPrefixes_Ptr = EcsUnitPrefixes_BindgenGetExtern() : EcsUnitPrefixes_Ptr);
 
     public static ref ulong EcsUri => ref *(ulong*)(EcsUri_Ptr == null ? EcsUri_Ptr = EcsUri_BindgenGetExtern() : EcsUri_Ptr);
@@ -7446,6 +7533,8 @@ public partial struct ecs_member_t_32
 
     public static ref ulong FLECS_IDEcsScriptMethodID_ => ref *(ulong*)(FLECS_IDEcsScriptMethodID__Ptr == null ? FLECS_IDEcsScriptMethodID__Ptr = FLECS_IDEcsScriptMethodID__BindgenGetExtern() : FLECS_IDEcsScriptMethodID__Ptr);
 
+    public static ref ulong FLECS_IDEcsScriptRngID_ => ref *(ulong*)(FLECS_IDEcsScriptRngID__Ptr == null ? FLECS_IDEcsScriptRngID__Ptr = FLECS_IDEcsScriptRngID__BindgenGetExtern() : FLECS_IDEcsScriptRngID__Ptr);
+
     public static ref ulong FLECS_IDEcsScriptTemplateID_ => ref *(ulong*)(FLECS_IDEcsScriptTemplateID__Ptr == null ? FLECS_IDEcsScriptTemplateID__Ptr = FLECS_IDEcsScriptTemplateID__BindgenGetExtern() : FLECS_IDEcsScriptTemplateID__Ptr);
 
     public static ref ulong FLECS_IDEcsStructID_ => ref *(ulong*)(FLECS_IDEcsStructID__Ptr == null ? FLECS_IDEcsStructID__Ptr = FLECS_IDEcsStructID__BindgenGetExtern() : FLECS_IDEcsStructID__Ptr);
@@ -7980,178 +8069,70 @@ public override int GetHashCode()
         }
     }
 
-    public partial struct ecs_switch_node_t : IEquatable<ecs_switch_node_t>
+    public partial struct ecs_strbuf_list_elem : IEquatable<ecs_strbuf_list_elem>
     {
-        public bool Equals(ecs_switch_node_t other)
+        public bool Equals(ecs_strbuf_list_elem other)
         {
-            fixed (ecs_switch_node_t* __self = &this)
+            fixed (ecs_strbuf_list_elem* __self = &this)
             {
-                return new Span<byte>(__self, sizeof(ecs_switch_node_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_switch_node_t)));
+                return new Span<byte>(__self, sizeof(ecs_strbuf_list_elem)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_strbuf_list_elem)));
             }
         }
 
         public override bool Equals(object? obj)
         {
-            return obj is ecs_switch_node_t other && Equals(other);
+            return obj is ecs_strbuf_list_elem other && Equals(other);
         }
 
-        public static bool operator ==(ecs_switch_node_t left, ecs_switch_node_t right)
+        public static bool operator ==(ecs_strbuf_list_elem left, ecs_strbuf_list_elem right)
         {
             return left.Equals(right);
         }
 
-        public static bool operator !=(ecs_switch_node_t left, ecs_switch_node_t right)
+        public static bool operator !=(ecs_strbuf_list_elem left, ecs_strbuf_list_elem right)
         {
             return !(left == right);
         }
 
         public override int GetHashCode()
         {
-            fixed (ecs_switch_node_t* __self = &this)
+            fixed (ecs_strbuf_list_elem* __self = &this)
             {
                 HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_switch_node_t)));
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_strbuf_list_elem)));
                 return hash.ToHashCode();
             }
         }
     }
 
-    public partial struct ecs_switch_page_t : IEquatable<ecs_switch_page_t>
+    public partial struct ecs_strbuf_t : IEquatable<ecs_strbuf_t>
     {
-        public bool Equals(ecs_switch_page_t other)
+        public bool Equals(ecs_strbuf_t other)
         {
-            fixed (ecs_switch_page_t* __self = &this)
+            fixed (ecs_strbuf_t* __self = &this)
             {
-                return new Span<byte>(__self, sizeof(ecs_switch_page_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_switch_page_t)));
+                return new Span<byte>(__self, sizeof(ecs_strbuf_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_strbuf_t)));
             }
         }
 
         public override bool Equals(object? obj)
         {
-            return obj is ecs_switch_page_t other && Equals(other);
+            return obj is ecs_strbuf_t other && Equals(other);
         }
 
-        public static bool operator ==(ecs_switch_page_t left, ecs_switch_page_t right)
+        public static bool operator ==(ecs_strbuf_t left, ecs_strbuf_t right)
         {
             return left.Equals(right);
         }
 
-        public static bool operator !=(ecs_switch_page_t left, ecs_switch_page_t right)
+        public static bool operator !=(ecs_strbuf_t left, ecs_strbuf_t right)
         {
             return !(left == right);
         }
 
         public override int GetHashCode()
         {
-            fixed (ecs_switch_page_t* __self = &this)
-            {
-                HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_switch_page_t)));
-                return hash.ToHashCode();
-            }
-        }
-    }
-
-    public partial struct ecs_switch_t : IEquatable<ecs_switch_t>
-    {
-        public bool Equals(ecs_switch_t other)
-        {
-            fixed (ecs_switch_t* __self = &this)
-            {
-                return new Span<byte>(__self, sizeof(ecs_switch_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_switch_t)));
-            }
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ecs_switch_t other && Equals(other);
-        }
-
-        public static bool operator ==(ecs_switch_t left, ecs_switch_t right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(ecs_switch_t left, ecs_switch_t right)
-        {
-            return !(left == right);
-        }
-
-        public override int GetHashCode()
-        {
-            fixed (ecs_switch_t* __self = &this)
-            {
-                HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_switch_t)));
-                return hash.ToHashCode();
-            }
-        }
-    }
-
-    public partial struct ecs_strbuf_list_elem : IEquatable<ecs_strbuf_list_elem>
-    {
-        public bool Equals(ecs_strbuf_list_elem other)
-        {
-            fixed (ecs_strbuf_list_elem* __self = &this)
-            {
-                return new Span<byte>(__self, sizeof(ecs_strbuf_list_elem)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_strbuf_list_elem)));
-            }
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ecs_strbuf_list_elem other && Equals(other);
-        }
-
-        public static bool operator ==(ecs_strbuf_list_elem left, ecs_strbuf_list_elem right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(ecs_strbuf_list_elem left, ecs_strbuf_list_elem right)
-        {
-            return !(left == right);
-        }
-
-        public override int GetHashCode()
-        {
-            fixed (ecs_strbuf_list_elem* __self = &this)
-            {
-                HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_strbuf_list_elem)));
-                return hash.ToHashCode();
-            }
-        }
-    }
-
-    public partial struct ecs_strbuf_t : IEquatable<ecs_strbuf_t>
-    {
-        public bool Equals(ecs_strbuf_t other)
-        {
-            fixed (ecs_strbuf_t* __self = &this)
-            {
-                return new Span<byte>(__self, sizeof(ecs_strbuf_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_strbuf_t)));
-            }
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ecs_strbuf_t other && Equals(other);
-        }
-
-        public static bool operator ==(ecs_strbuf_t left, ecs_strbuf_t right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(ecs_strbuf_t left, ecs_strbuf_t right)
-        {
-            return !(left == right);
-        }
-
-        public override int GetHashCode()
-        {
-            fixed (ecs_strbuf_t* __self = &this)
+            fixed (ecs_strbuf_t* __self = &this)
             {
                 HashCode hash = new();
                 hash.AddBytes(new Span<byte>(__self, sizeof(ecs_strbuf_t)));
@@ -8700,37 +8681,37 @@ public override int GetHashCode()
         }
     }
 
-    public partial struct ecs_id_record_t : IEquatable<ecs_id_record_t>
+    public partial struct ecs_component_record_t : IEquatable<ecs_component_record_t>
     {
-        public bool Equals(ecs_id_record_t other)
+        public bool Equals(ecs_component_record_t other)
         {
-            fixed (ecs_id_record_t* __self = &this)
+            fixed (ecs_component_record_t* __self = &this)
             {
-                return new Span<byte>(__self, sizeof(ecs_id_record_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_id_record_t)));
+                return new Span<byte>(__self, sizeof(ecs_component_record_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_component_record_t)));
             }
         }
 
         public override bool Equals(object? obj)
         {
-            return obj is ecs_id_record_t other && Equals(other);
+            return obj is ecs_component_record_t other && Equals(other);
         }
 
-        public static bool operator ==(ecs_id_record_t left, ecs_id_record_t right)
+        public static bool operator ==(ecs_component_record_t left, ecs_component_record_t right)
         {
             return left.Equals(right);
         }
 
-        public static bool operator !=(ecs_id_record_t left, ecs_id_record_t right)
+        public static bool operator !=(ecs_component_record_t left, ecs_component_record_t right)
         {
             return !(left == right);
         }
 
         public override int GetHashCode()
         {
-            fixed (ecs_id_record_t* __self = &this)
+            fixed (ecs_component_record_t* __self = &this)
             {
                 HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_id_record_t)));
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_component_record_t)));
                 return hash.ToHashCode();
             }
         }
@@ -8808,78 +8789,6 @@ public override int GetHashCode()
         }
     }
 
-    public partial struct ecs_table_cache_hdr_t : IEquatable<ecs_table_cache_hdr_t>
-    {
-        public bool Equals(ecs_table_cache_hdr_t other)
-        {
-            fixed (ecs_table_cache_hdr_t* __self = &this)
-            {
-                return new Span<byte>(__self, sizeof(ecs_table_cache_hdr_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_table_cache_hdr_t)));
-            }
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ecs_table_cache_hdr_t other && Equals(other);
-        }
-
-        public static bool operator ==(ecs_table_cache_hdr_t left, ecs_table_cache_hdr_t right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(ecs_table_cache_hdr_t left, ecs_table_cache_hdr_t right)
-        {
-            return !(left == right);
-        }
-
-        public override int GetHashCode()
-        {
-            fixed (ecs_table_cache_hdr_t* __self = &this)
-            {
-                HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_table_cache_hdr_t)));
-                return hash.ToHashCode();
-            }
-        }
-    }
-
-    public partial struct ecs_table_cache_t : IEquatable<ecs_table_cache_t>
-    {
-        public bool Equals(ecs_table_cache_t other)
-        {
-            fixed (ecs_table_cache_t* __self = &this)
-            {
-                return new Span<byte>(__self, sizeof(ecs_table_cache_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_table_cache_t)));
-            }
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ecs_table_cache_t other && Equals(other);
-        }
-
-        public static bool operator ==(ecs_table_cache_t left, ecs_table_cache_t right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(ecs_table_cache_t left, ecs_table_cache_t right)
-        {
-            return !(left == right);
-        }
-
-        public override int GetHashCode()
-        {
-            fixed (ecs_table_cache_t* __self = &this)
-            {
-                HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_table_cache_t)));
-                return hash.ToHashCode();
-            }
-        }
-    }
-
     public partial struct ecs_table_record_t : IEquatable<ecs_table_record_t>
     {
         public bool Equals(ecs_table_record_t other)
@@ -8988,37 +8897,73 @@ public override int GetHashCode()
         }
     }
 
-    public partial struct ecs_query_cache_table_match_t : IEquatable<ecs_query_cache_table_match_t>
+    public partial struct ecs_query_cache_match_t : IEquatable<ecs_query_cache_match_t>
+    {
+        public bool Equals(ecs_query_cache_match_t other)
+        {
+            fixed (ecs_query_cache_match_t* __self = &this)
+            {
+                return new Span<byte>(__self, sizeof(ecs_query_cache_match_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_query_cache_match_t)));
+            }
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ecs_query_cache_match_t other && Equals(other);
+        }
+
+        public static bool operator ==(ecs_query_cache_match_t left, ecs_query_cache_match_t right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ecs_query_cache_match_t left, ecs_query_cache_match_t right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            fixed (ecs_query_cache_match_t* __self = &this)
+            {
+                HashCode hash = new();
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_query_cache_match_t)));
+                return hash.ToHashCode();
+            }
+        }
+    }
+
+    public partial struct ecs_query_cache_group_t : IEquatable<ecs_query_cache_group_t>
     {
-        public bool Equals(ecs_query_cache_table_match_t other)
+        public bool Equals(ecs_query_cache_group_t other)
         {
-            fixed (ecs_query_cache_table_match_t* __self = &this)
+            fixed (ecs_query_cache_group_t* __self = &this)
             {
-                return new Span<byte>(__self, sizeof(ecs_query_cache_table_match_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_query_cache_table_match_t)));
+                return new Span<byte>(__self, sizeof(ecs_query_cache_group_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_query_cache_group_t)));
             }
         }
 
         public override bool Equals(object? obj)
         {
-            return obj is ecs_query_cache_table_match_t other && Equals(other);
+            return obj is ecs_query_cache_group_t other && Equals(other);
         }
 
-        public static bool operator ==(ecs_query_cache_table_match_t left, ecs_query_cache_table_match_t right)
+        public static bool operator ==(ecs_query_cache_group_t left, ecs_query_cache_group_t right)
         {
             return left.Equals(right);
         }
 
-        public static bool operator !=(ecs_query_cache_table_match_t left, ecs_query_cache_table_match_t right)
+        public static bool operator !=(ecs_query_cache_group_t left, ecs_query_cache_group_t right)
         {
             return !(left == right);
         }
 
         public override int GetHashCode()
         {
-            fixed (ecs_query_cache_table_match_t* __self = &this)
+            fixed (ecs_query_cache_group_t* __self = &this)
             {
                 HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_query_cache_table_match_t)));
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_query_cache_group_t)));
                 return hash.ToHashCode();
             }
         }
@@ -9276,6 +9221,42 @@ public override int GetHashCode()
         }
     }
 
+    public partial struct ecs_table_cache_hdr_t : IEquatable<ecs_table_cache_hdr_t>
+    {
+        public bool Equals(ecs_table_cache_hdr_t other)
+        {
+            fixed (ecs_table_cache_hdr_t* __self = &this)
+            {
+                return new Span<byte>(__self, sizeof(ecs_table_cache_hdr_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_table_cache_hdr_t)));
+            }
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ecs_table_cache_hdr_t other && Equals(other);
+        }
+
+        public static bool operator ==(ecs_table_cache_hdr_t left, ecs_table_cache_hdr_t right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ecs_table_cache_hdr_t left, ecs_table_cache_hdr_t right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            fixed (ecs_table_cache_hdr_t* __self = &this)
+            {
+                HashCode hash = new();
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_table_cache_hdr_t)));
+                return hash.ToHashCode();
+            }
+        }
+    }
+
     public partial struct ecs_each_iter_t : IEquatable<ecs_each_iter_t>
     {
         public bool Equals(ecs_each_iter_t other)
@@ -9492,42 +9473,6 @@ public override int GetHashCode()
         }
     }
 
-    public partial struct ecs_iter_cache_t : IEquatable<ecs_iter_cache_t>
-    {
-        public bool Equals(ecs_iter_cache_t other)
-        {
-            fixed (ecs_iter_cache_t* __self = &this)
-            {
-                return new Span<byte>(__self, sizeof(ecs_iter_cache_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_iter_cache_t)));
-            }
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is ecs_iter_cache_t other && Equals(other);
-        }
-
-        public static bool operator ==(ecs_iter_cache_t left, ecs_iter_cache_t right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(ecs_iter_cache_t left, ecs_iter_cache_t right)
-        {
-            return !(left == right);
-        }
-
-        public override int GetHashCode()
-        {
-            fixed (ecs_iter_cache_t* __self = &this)
-            {
-                HashCode hash = new();
-                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_iter_cache_t)));
-                return hash.ToHashCode();
-            }
-        }
-    }
-
     public partial struct ecs_iter_private_t : IEquatable<ecs_iter_private_t>
     {
         public bool Equals(ecs_iter_private_t other)
@@ -9566,37 +9511,37 @@ public override int GetHashCode()
 
     public partial struct ecs_iter_private_t
     {
-        public partial struct AnonymousRecord_api_types_L153_C5 : IEquatable<AnonymousRecord_api_types_L153_C5>
+        public partial struct AnonymousRecord_api_types_L143_C5 : IEquatable<AnonymousRecord_api_types_L143_C5>
         {
-            public bool Equals(AnonymousRecord_api_types_L153_C5 other)
+            public bool Equals(AnonymousRecord_api_types_L143_C5 other)
             {
-                fixed (AnonymousRecord_api_types_L153_C5* __self = &this)
+                fixed (AnonymousRecord_api_types_L143_C5* __self = &this)
                 {
-                    return new Span<byte>(__self, sizeof(AnonymousRecord_api_types_L153_C5)).SequenceEqual(new Span<byte>(&other, sizeof(AnonymousRecord_api_types_L153_C5)));
+                    return new Span<byte>(__self, sizeof(AnonymousRecord_api_types_L143_C5)).SequenceEqual(new Span<byte>(&other, sizeof(AnonymousRecord_api_types_L143_C5)));
                 }
             }
 
             public override bool Equals(object? obj)
             {
-                return obj is AnonymousRecord_api_types_L153_C5 other && Equals(other);
+                return obj is AnonymousRecord_api_types_L143_C5 other && Equals(other);
             }
 
-            public static bool operator ==(AnonymousRecord_api_types_L153_C5 left, AnonymousRecord_api_types_L153_C5 right)
+            public static bool operator ==(AnonymousRecord_api_types_L143_C5 left, AnonymousRecord_api_types_L143_C5 right)
             {
                 return left.Equals(right);
             }
 
-            public static bool operator !=(AnonymousRecord_api_types_L153_C5 left, AnonymousRecord_api_types_L153_C5 right)
+            public static bool operator !=(AnonymousRecord_api_types_L143_C5 left, AnonymousRecord_api_types_L143_C5 right)
             {
                 return !(left == right);
             }
 
             public override int GetHashCode()
             {
-                fixed (AnonymousRecord_api_types_L153_C5* __self = &this)
+                fixed (AnonymousRecord_api_types_L143_C5* __self = &this)
                 {
                     HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(AnonymousRecord_api_types_L153_C5)));
+                    hash.AddBytes(new Span<byte>(__self, sizeof(AnonymousRecord_api_types_L143_C5)));
                     return hash.ToHashCode();
                 }
             }
@@ -9819,6 +9764,114 @@ public override int GetHashCode()
         }
     }
 
+    public partial struct ecs_table_cache_t : IEquatable<ecs_table_cache_t>
+    {
+        public bool Equals(ecs_table_cache_t other)
+        {
+            fixed (ecs_table_cache_t* __self = &this)
+            {
+                return new Span<byte>(__self, sizeof(ecs_table_cache_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_table_cache_t)));
+            }
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ecs_table_cache_t other && Equals(other);
+        }
+
+        public static bool operator ==(ecs_table_cache_t left, ecs_table_cache_t right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ecs_table_cache_t left, ecs_table_cache_t right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            fixed (ecs_table_cache_t* __self = &this)
+            {
+                HashCode hash = new();
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_table_cache_t)));
+                return hash.ToHashCode();
+            }
+        }
+    }
+
+    public partial struct ecs_table_diff_t : IEquatable<ecs_table_diff_t>
+    {
+        public bool Equals(ecs_table_diff_t other)
+        {
+            fixed (ecs_table_diff_t* __self = &this)
+            {
+                return new Span<byte>(__self, sizeof(ecs_table_diff_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_table_diff_t)));
+            }
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ecs_table_diff_t other && Equals(other);
+        }
+
+        public static bool operator ==(ecs_table_diff_t left, ecs_table_diff_t right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ecs_table_diff_t left, ecs_table_diff_t right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            fixed (ecs_table_diff_t* __self = &this)
+            {
+                HashCode hash = new();
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_table_diff_t)));
+                return hash.ToHashCode();
+            }
+        }
+    }
+
+    public partial struct ecs_table_records_t : IEquatable<ecs_table_records_t>
+    {
+        public bool Equals(ecs_table_records_t other)
+        {
+            fixed (ecs_table_records_t* __self = &this)
+            {
+                return new Span<byte>(__self, sizeof(ecs_table_records_t)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_table_records_t)));
+            }
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ecs_table_records_t other && Equals(other);
+        }
+
+        public static bool operator ==(ecs_table_records_t left, ecs_table_records_t right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ecs_table_records_t left, ecs_table_records_t right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            fixed (ecs_table_records_t* __self = &this)
+            {
+                HashCode hash = new();
+                hash.AddBytes(new Span<byte>(__self, sizeof(ecs_table_records_t)));
+                return hash.ToHashCode();
+            }
+        }
+    }
+
     public partial struct ecs_value_t : IEquatable<ecs_value_t>
     {
         public bool Equals(ecs_value_t other)
@@ -10145,37 +10198,37 @@ public override int GetHashCode()
 
     public partial struct ecs_world_info_t
     {
-        public partial struct AnonymousRecord_flecs_L1468_C5 : IEquatable<AnonymousRecord_flecs_L1468_C5>
+        public partial struct AnonymousRecord_flecs_L1484_C5 : IEquatable<AnonymousRecord_flecs_L1484_C5>
         {
-            public bool Equals(AnonymousRecord_flecs_L1468_C5 other)
+            public bool Equals(AnonymousRecord_flecs_L1484_C5 other)
             {
-                fixed (AnonymousRecord_flecs_L1468_C5* __self = &this)
+                fixed (AnonymousRecord_flecs_L1484_C5* __self = &this)
                 {
-                    return new Span<byte>(__self, sizeof(AnonymousRecord_flecs_L1468_C5)).SequenceEqual(new Span<byte>(&other, sizeof(AnonymousRecord_flecs_L1468_C5)));
+                    return new Span<byte>(__self, sizeof(AnonymousRecord_flecs_L1484_C5)).SequenceEqual(new Span<byte>(&other, sizeof(AnonymousRecord_flecs_L1484_C5)));
                 }
             }
 
             public override bool Equals(object? obj)
             {
-                return obj is AnonymousRecord_flecs_L1468_C5 other && Equals(other);
+                return obj is AnonymousRecord_flecs_L1484_C5 other && Equals(other);
             }
 
-            public static bool operator ==(AnonymousRecord_flecs_L1468_C5 left, AnonymousRecord_flecs_L1468_C5 right)
+            public static bool operator ==(AnonymousRecord_flecs_L1484_C5 left, AnonymousRecord_flecs_L1484_C5 right)
             {
                 return left.Equals(right);
             }
 
-            public static bool operator !=(AnonymousRecord_flecs_L1468_C5 left, AnonymousRecord_flecs_L1468_C5 right)
+            public static bool operator !=(AnonymousRecord_flecs_L1484_C5 left, AnonymousRecord_flecs_L1484_C5 right)
             {
                 return !(left == right);
             }
 
             public override int GetHashCode()
             {
-                fixed (AnonymousRecord_flecs_L1468_C5* __self = &this)
+                fixed (AnonymousRecord_flecs_L1484_C5* __self = &this)
                 {
                     HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(AnonymousRecord_flecs_L1468_C5)));
+                    hash.AddBytes(new Span<byte>(__self, sizeof(AnonymousRecord_flecs_L1484_C5)));
                     return hash.ToHashCode();
                 }
             }
@@ -12189,6 +12242,42 @@ public override int GetHashCode()
         }
     }
 
+    public partial struct EcsScriptRng : IEquatable<EcsScriptRng>
+    {
+        public bool Equals(EcsScriptRng other)
+        {
+            fixed (EcsScriptRng* __self = &this)
+            {
+                return new Span<byte>(__self, sizeof(EcsScriptRng)).SequenceEqual(new Span<byte>(&other, sizeof(EcsScriptRng)));
+            }
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is EcsScriptRng other && Equals(other);
+        }
+
+        public static bool operator ==(EcsScriptRng left, EcsScriptRng right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(EcsScriptRng left, EcsScriptRng right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            fixed (EcsScriptRng* __self = &this)
+            {
+                HashCode hash = new();
+                hash.AddBytes(new Span<byte>(__self, sizeof(EcsScriptRng)));
+                return hash.ToHashCode();
+            }
+        }
+    }
+
     public partial struct ecs_script_template_t : IEquatable<ecs_script_template_t>
     {
         public bool Equals(ecs_script_template_t other)
@@ -14033,76 +14122,37 @@ public override int GetHashCode()
 
     public partial struct InlineArrays
     {
-        public partial struct ecs_term_t_32 : IEquatable<ecs_term_t_32>
-        {
-            public bool Equals(ecs_term_t_32 other)
-            {
-                fixed (ecs_term_t_32* __self = &this)
-                {
-                    return new Span<byte>(__self, sizeof(ecs_term_t_32)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_term_t_32)));
-                }
-            }
-
-            public override bool Equals(object? obj)
-            {
-                return obj is ecs_term_t_32 other && Equals(other);
-            }
-
-            public static bool operator ==(ecs_term_t_32 left, ecs_term_t_32 right)
-            {
-                return left.Equals(right);
-            }
-
-            public static bool operator !=(ecs_term_t_32 left, ecs_term_t_32 right)
-            {
-                return !(left == right);
-            }
-
-            public override int GetHashCode()
-            {
-                fixed (ecs_term_t_32* __self = &this)
-                {
-                    HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(ecs_term_t_32)));
-                    return hash.ToHashCode();
-                }
-            }
-        }
-    }
-
-    public partial struct InlineArrays
-    {
-        public partial struct int_32 : IEquatable<int_32>
+        public partial struct ulong_8 : IEquatable<ulong_8>
         {
-            public bool Equals(int_32 other)
+            public bool Equals(ulong_8 other)
             {
-                fixed (int_32* __self = &this)
+                fixed (ulong_8* __self = &this)
                 {
-                    return new Span<byte>(__self, sizeof(int_32)).SequenceEqual(new Span<byte>(&other, sizeof(int_32)));
+                    return new Span<byte>(__self, sizeof(ulong_8)).SequenceEqual(new Span<byte>(&other, sizeof(ulong_8)));
                 }
             }
 
             public override bool Equals(object? obj)
             {
-                return obj is int_32 other && Equals(other);
+                return obj is ulong_8 other && Equals(other);
             }
 
-            public static bool operator ==(int_32 left, int_32 right)
+            public static bool operator ==(ulong_8 left, ulong_8 right)
             {
                 return left.Equals(right);
             }
 
-            public static bool operator !=(int_32 left, int_32 right)
+            public static bool operator !=(ulong_8 left, ulong_8 right)
             {
                 return !(left == right);
             }
 
             public override int GetHashCode()
             {
-                fixed (int_32* __self = &this)
+                fixed (ulong_8* __self = &this)
                 {
                     HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(int_32)));
+                    hash.AddBytes(new Span<byte>(__self, sizeof(ulong_8)));
                     return hash.ToHashCode();
                 }
             }
@@ -14111,37 +14161,37 @@ public override int GetHashCode()
 
     public partial struct InlineArrays
     {
-        public partial struct ulong_32 : IEquatable<ulong_32>
+        public partial struct int_2 : IEquatable<int_2>
         {
-            public bool Equals(ulong_32 other)
+            public bool Equals(int_2 other)
             {
-                fixed (ulong_32* __self = &this)
+                fixed (int_2* __self = &this)
                 {
-                    return new Span<byte>(__self, sizeof(ulong_32)).SequenceEqual(new Span<byte>(&other, sizeof(ulong_32)));
+                    return new Span<byte>(__self, sizeof(int_2)).SequenceEqual(new Span<byte>(&other, sizeof(int_2)));
                 }
             }
 
             public override bool Equals(object? obj)
             {
-                return obj is ulong_32 other && Equals(other);
+                return obj is int_2 other && Equals(other);
             }
 
-            public static bool operator ==(ulong_32 left, ulong_32 right)
+            public static bool operator ==(int_2 left, int_2 right)
             {
                 return left.Equals(right);
             }
 
-            public static bool operator !=(ulong_32 left, ulong_32 right)
+            public static bool operator !=(int_2 left, int_2 right)
             {
                 return !(left == right);
             }
 
             public override int GetHashCode()
             {
-                fixed (ulong_32* __self = &this)
+                fixed (int_2* __self = &this)
                 {
                     HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(ulong_32)));
+                    hash.AddBytes(new Span<byte>(__self, sizeof(int_2)));
                     return hash.ToHashCode();
                 }
             }
@@ -14150,37 +14200,37 @@ public override int GetHashCode()
 
     public partial struct InlineArrays
     {
-        public partial struct ulong_8 : IEquatable<ulong_8>
+        public partial struct ecs_commands_t_2 : IEquatable<ecs_commands_t_2>
         {
-            public bool Equals(ulong_8 other)
+            public bool Equals(ecs_commands_t_2 other)
             {
-                fixed (ulong_8* __self = &this)
+                fixed (ecs_commands_t_2* __self = &this)
                 {
-                    return new Span<byte>(__self, sizeof(ulong_8)).SequenceEqual(new Span<byte>(&other, sizeof(ulong_8)));
+                    return new Span<byte>(__self, sizeof(ecs_commands_t_2)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_commands_t_2)));
                 }
             }
 
             public override bool Equals(object? obj)
             {
-                return obj is ulong_8 other && Equals(other);
+                return obj is ecs_commands_t_2 other && Equals(other);
             }
 
-            public static bool operator ==(ulong_8 left, ulong_8 right)
+            public static bool operator ==(ecs_commands_t_2 left, ecs_commands_t_2 right)
             {
                 return left.Equals(right);
             }
 
-            public static bool operator !=(ulong_8 left, ulong_8 right)
+            public static bool operator !=(ecs_commands_t_2 left, ecs_commands_t_2 right)
             {
                 return !(left == right);
             }
 
             public override int GetHashCode()
             {
-                fixed (ulong_8* __self = &this)
+                fixed (ecs_commands_t_2* __self = &this)
                 {
                     HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(ulong_8)));
+                    hash.AddBytes(new Span<byte>(__self, sizeof(ecs_commands_t_2)));
                     return hash.ToHashCode();
                 }
             }
@@ -14189,37 +14239,37 @@ public override int GetHashCode()
 
     public partial struct InlineArrays
     {
-        public partial struct int_2 : IEquatable<int_2>
+        public partial struct ulong_32 : IEquatable<ulong_32>
         {
-            public bool Equals(int_2 other)
+            public bool Equals(ulong_32 other)
             {
-                fixed (int_2* __self = &this)
+                fixed (ulong_32* __self = &this)
                 {
-                    return new Span<byte>(__self, sizeof(int_2)).SequenceEqual(new Span<byte>(&other, sizeof(int_2)));
+                    return new Span<byte>(__self, sizeof(ulong_32)).SequenceEqual(new Span<byte>(&other, sizeof(ulong_32)));
                 }
             }
 
             public override bool Equals(object? obj)
             {
-                return obj is int_2 other && Equals(other);
+                return obj is ulong_32 other && Equals(other);
             }
 
-            public static bool operator ==(int_2 left, int_2 right)
+            public static bool operator ==(ulong_32 left, ulong_32 right)
             {
                 return left.Equals(right);
             }
 
-            public static bool operator !=(int_2 left, int_2 right)
+            public static bool operator !=(ulong_32 left, ulong_32 right)
             {
                 return !(left == right);
             }
 
             public override int GetHashCode()
             {
-                fixed (int_2* __self = &this)
+                fixed (ulong_32* __self = &this)
                 {
                     HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(int_2)));
+                    hash.AddBytes(new Span<byte>(__self, sizeof(ulong_32)));
                     return hash.ToHashCode();
                 }
             }
@@ -14228,37 +14278,37 @@ public override int GetHashCode()
 
     public partial struct InlineArrays
     {
-        public partial struct ecs_commands_t_2 : IEquatable<ecs_commands_t_2>
+        public partial struct ecs_term_t_32 : IEquatable<ecs_term_t_32>
         {
-            public bool Equals(ecs_commands_t_2 other)
+            public bool Equals(ecs_term_t_32 other)
             {
-                fixed (ecs_commands_t_2* __self = &this)
+                fixed (ecs_term_t_32* __self = &this)
                 {
-                    return new Span<byte>(__self, sizeof(ecs_commands_t_2)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_commands_t_2)));
+                    return new Span<byte>(__self, sizeof(ecs_term_t_32)).SequenceEqual(new Span<byte>(&other, sizeof(ecs_term_t_32)));
                 }
             }
 
             public override bool Equals(object? obj)
             {
-                return obj is ecs_commands_t_2 other && Equals(other);
+                return obj is ecs_term_t_32 other && Equals(other);
             }
 
-            public static bool operator ==(ecs_commands_t_2 left, ecs_commands_t_2 right)
+            public static bool operator ==(ecs_term_t_32 left, ecs_term_t_32 right)
             {
                 return left.Equals(right);
             }
 
-            public static bool operator !=(ecs_commands_t_2 left, ecs_commands_t_2 right)
+            public static bool operator !=(ecs_term_t_32 left, ecs_term_t_32 right)
             {
                 return !(left == right);
             }
 
             public override int GetHashCode()
             {
-                fixed (ecs_commands_t_2* __self = &this)
+                fixed (ecs_term_t_32* __self = &this)
                 {
                     HashCode hash = new();
-                    hash.AddBytes(new Span<byte>(__self, sizeof(ecs_commands_t_2)));
+                    hash.AddBytes(new Span<byte>(__self, sizeof(ecs_term_t_32)));
                     return hash.ToHashCode();
                 }
             }
diff --git a/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs b/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
index 16aa6247..4a8f131e 100644
--- a/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+++ b/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
@@ -1,1156 +1,1162 @@
-using Flecs.NET.Codegen.Helpers;
-
-namespace Flecs.NET.Codegen.Generators;
-
-public class QueryBuilder : GeneratorBase
-{
-    public override void Generate()
-    {
-        for (int i = 0; i < Generator.GenericCount; i++)
-        {
-            AddSource($"QueryBuilder/T{i + 1}.g.cs", GenerateQueryBuilder(i));
-            AddSource($"QueryBuilder.QueryBuilder/T{i + 1}.g.cs", GenerateExtensions(Type.QueryBuilder, i));
-        }
-    }
-
-    private static string GenerateQueryBuilder(int i)
-    {
-        return $$"""
-            #nullable enable
-
-            using static Flecs.NET.Bindings.flecs;
-
-            namespace Flecs.NET.Core;
-
-            /// <summary>
-            ///     A type-safe wrapper around <see cref="QueryBuilder"/> that takes {{i + 1}} type arguments.
-            /// </summary>
-            /// {{Generator.XmlTypeParameters[i]}}
-            public unsafe partial struct {{Generator.GetTypeName(Type.QueryBuilder, i)}} : IQueryBuilder<{{Generator.GetTypeName(Type.QueryBuilder, i)}}, {{Generator.GetTypeName(Type.Query, i)}}>
-            {
-                private QueryBuilder _queryBuilder;
-            
-                ref QueryBuilder IQueryBuilderBase.QueryBuilder => ref _queryBuilder;
-                
-                /// <inheritdoc cref="QueryBuilder.World"/>
-                public ref ecs_world_t* World => ref _queryBuilder.World;
-                
-                /// <inheritdoc cref="QueryBuilder.Desc"/>
-                public ref ecs_query_desc_t Desc => ref _queryBuilder.Desc;
-            
-                /// <inheritdoc cref="QueryBuilder(ecs_world_t*)"/>
-                public QueryBuilder(ecs_world_t* world)
-                {
-                    {{Generator.GetTypeName(Type.TypeHelper, i)}}.AssertNoTags();
-                    _queryBuilder = new QueryBuilder(world){{Generator.WithChain[i]}};
-                }
-            
-                /// <inheritdoc cref="QueryBuilder(ecs_world_t*, ulong)"/>
-                public QueryBuilder(ecs_world_t* world, ulong entity)
-                {
-                    {{Generator.GetTypeName(Type.TypeHelper, i)}}.AssertNoTags();
-                    _queryBuilder = new QueryBuilder(world, entity){{Generator.WithChain[i]}};
-                }
-            
-                /// <inheritdoc cref="QueryBuilder(ecs_world_t*, string)"/>
-                public QueryBuilder(ecs_world_t* world, string name)
-                {
-                    {{Generator.GetTypeName(Type.TypeHelper, i)}}.AssertNoTags();
-                    _queryBuilder = new QueryBuilder(world, name){{Generator.WithChain[i]}};
-                }
-            
-                /// <inheritdoc cref="QueryBuilder.Build()"/>
-                public {{Generator.GetTypeName(Type.Query, i)}} Build()
-                {
-                    return new {{Generator.GetTypeName(Type.Query, i)}}(_queryBuilder.Build());
-                }
-                
-                /// <inheritdoc cref="QueryBuilder.Equals(QueryBuilder)"/>
-                public bool Equals({{Generator.GetTypeName(Type.QueryBuilder, i)}} other)
-                {
-                    return _queryBuilder == other._queryBuilder;
-                }
-            
-                /// <inheritdoc cref="QueryBuilder.Equals(object)"/>
-                public override bool Equals(object? obj)
-                {
-                    return obj is {{Generator.GetTypeName(Type.QueryBuilder, i)}}  other && Equals(other);
-                }
-            
-                /// <inheritdoc cref="QueryBuilder.GetHashCode()"/>
-                public override int GetHashCode()
-                {
-                    return _queryBuilder.GetHashCode();
-                }
-            
-                /// <inheritdoc cref="QueryBuilder.op_Equality"/>
-                public static bool operator ==({{Generator.GetTypeName(Type.QueryBuilder, i)}} left, {{Generator.GetTypeName(Type.QueryBuilder, i)}} right)
-                {
-                    return left.Equals(right);
-                }
-            
-                /// <inheritdoc cref="QueryBuilder.op_Inequality"/>
-                public static bool operator !=({{Generator.GetTypeName(Type.QueryBuilder, i)}} left, {{Generator.GetTypeName(Type.QueryBuilder, i)}} right)
-                {
-                    return !(left == right);
-                }
-            }
-            """;
-    }
-
-    public static string GenerateExtensions(Type type, int i = -1)
-    {
-        return $$"""
-            using System;
-            using static Flecs.NET.Bindings.flecs;
-
-            namespace Flecs.NET.Core;
-
-            public unsafe partial struct {{Generator.GetTypeName(type, i)}}
-            {
-                /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Self()
-                {
-                    Ecs.GetQueryBuilder(ref this).Self();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Id(ulong id)
-                {
-                    Ecs.GetQueryBuilder(ref this).Id(id);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Entity(ulong entity)
-                {
-                    Ecs.GetQueryBuilder(ref this).Entity(entity);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Name(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).Name(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Var(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).Var(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Term(ulong id)
-                {
-                    Ecs.GetQueryBuilder(ref this).Term(id);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Src()
-                {
-                    Ecs.GetQueryBuilder(ref this).Src();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-                public ref {{Generator.GetTypeName(type, i)}} First()
-                {
-                    Ecs.GetQueryBuilder(ref this).First();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Second()
-                {
-                    Ecs.GetQueryBuilder(ref this).Second();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Src(ulong srcId)
-                {
-                    Ecs.GetQueryBuilder(ref this).Src(srcId);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Src<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Src<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Src<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Src(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Src(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).Src(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} First(ulong firstId)
-                {
-                    Ecs.GetQueryBuilder(ref this).First(firstId);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} First<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).First<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} First<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).First(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} First(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).First(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Second(ulong secondId)
-                {
-                    Ecs.GetQueryBuilder(ref this).Second(secondId);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Second<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Second<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Second<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Second(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Second(string secondName)
-                {
-                    Ecs.GetQueryBuilder(ref this).Second(secondName);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Up(ulong traverse = 0)
-                {
-                    Ecs.GetQueryBuilder(ref this).Up(traverse);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Up<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Up<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Up<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Up(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Cascade(ulong traverse = 0)
-                {
-                    Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Cascade<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Cascade<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Cascade<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Cascade(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Descend()
-                {
-                    Ecs.GetQueryBuilder(ref this).Descend();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Parent()
-                {
-                    Ecs.GetQueryBuilder(ref this).Parent();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Trav(ulong traverse, uint flags = 0)
-                {
-                    Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Trav<T>(uint flags = 0)
-                {
-                    Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Trav<T>(T value, uint flags = 0) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-                public ref {{Generator.GetTypeName(type, i)}} Flags(ulong flags)
-                {
-                    Ecs.GetQueryBuilder(ref this).Flags(flags);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-                public ref {{Generator.GetTypeName(type, i)}} InOut(ecs_inout_kind_t inOut)
-                {
-                    Ecs.GetQueryBuilder(ref this).InOut(inOut);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-                public ref {{Generator.GetTypeName(type, i)}} InOutStage(ecs_inout_kind_t inOut)
-                {
-                    Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write()
-                {
-                    Ecs.GetQueryBuilder(ref this).Write();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read()
-                {
-                    Ecs.GetQueryBuilder(ref this).Read();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-                public ref {{Generator.GetTypeName(type, i)}} ReadWrite()
-                {
-                    Ecs.GetQueryBuilder(ref this).ReadWrite();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-                public ref {{Generator.GetTypeName(type, i)}} In()
-                {
-                    Ecs.GetQueryBuilder(ref this).In();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Out()
-                {
-                    Ecs.GetQueryBuilder(ref this).Out();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-                public ref {{Generator.GetTypeName(type, i)}} InOut()
-                {
-                    Ecs.GetQueryBuilder(ref this).InOut();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-                public ref {{Generator.GetTypeName(type, i)}} InOutNone()
-                {
-                    Ecs.GetQueryBuilder(ref this).InOutNone();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Oper(ecs_oper_kind_t oper)
-                {
-                    Ecs.GetQueryBuilder(ref this).Oper(oper);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-                public ref {{Generator.GetTypeName(type, i)}} And()
-                {
-                    Ecs.GetQueryBuilder(ref this).And();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Or()
-                {
-                    Ecs.GetQueryBuilder(ref this).Or();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Not()
-                {
-                    Ecs.GetQueryBuilder(ref this).Not();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Optional()
-                {
-                    Ecs.GetQueryBuilder(ref this).Optional();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-                public ref {{Generator.GetTypeName(type, i)}} AndFrom()
-                {
-                    Ecs.GetQueryBuilder(ref this).AndFrom();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-                public ref {{Generator.GetTypeName(type, i)}} OrFrom()
-                {
-                    Ecs.GetQueryBuilder(ref this).OrFrom();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-                public ref {{Generator.GetTypeName(type, i)}} NotFrom()
-                {
-                    Ecs.GetQueryBuilder(ref this).NotFrom();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Singleton()
-                {
-                    Ecs.GetQueryBuilder(ref this).Singleton();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Filter()
-                {
-                    Ecs.GetQueryBuilder(ref this).Filter();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-                public ref {{Generator.GetTypeName(type, i)}} QueryFlags(uint flags)
-                {
-                    Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-                public ref {{Generator.GetTypeName(type, i)}} CacheKind(ecs_query_cache_kind_t kind)
-                {
-                    Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Cached()
-                {
-                    Ecs.GetQueryBuilder(ref this).Cached();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Expr(string expr)
-                {
-                    Ecs.GetQueryBuilder(ref this).Expr(expr);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With(Term term)
-                {
-                    Ecs.GetQueryBuilder(ref this).With(term);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With(ulong id)
-                {
-                    Ecs.GetQueryBuilder(ref this).With(id);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).With(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With(ulong first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).With(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With(ulong first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).With(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With(string first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).With(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With(string first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).With(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).With<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).With(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<TFirst>(ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<TFirst>(string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<TFirst, TSecond>()
-                {
-                    Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<TFirst>(TFirst first, string second) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).With(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} With<TSecond>(string first, TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).With(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} WithSecond<TSecond>(ulong first)
-                {
-                    Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} WithSecond<TSecond>(string first)
-                {
-                    Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without(Term term)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(term);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without(ulong id)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(id);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without(ulong first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without(ulong first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without(string first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without(string first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Without<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst>(ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst>(string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst, TSecond>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst>(TFirst first, string second) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Without<TSecond>(string first, TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Without(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} WithoutSecond<TSecond>(ulong first)
-                {
-                    Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} WithoutSecond<TSecond>(string first)
-                {
-                    Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write(Term term)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(term);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write(ulong id)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(id);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write(ulong first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write(ulong first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write(string first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write(string first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Write<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst>(ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst>(string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst, TSecond>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst>(TFirst first, string second) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Write<TSecond>(string first, TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Write(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} WriteSecond<TSecond>(ulong first)
-                {
-                    Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} WriteSecond<TSecond>(string first)
-                {
-                    Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read(Term term)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(term);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read(ulong id)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(id);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read(string name)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(name);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read(ulong first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read(ulong first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read(string first, ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read(string first, string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Read<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<T>(T value) where T : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(value);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst>(ulong second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst>(string second)
-                {
-                    Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst, TSecond>()
-                {
-                    Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst>(TFirst first, string second) where TFirst : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-                public ref {{Generator.GetTypeName(type, i)}} Read<TSecond>(string first, TSecond second) where TSecond : Enum
-                {
-                    Ecs.GetQueryBuilder(ref this).Read(first, second);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} ReadSecond<TSecond>(ulong first)
-                {
-                    Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-                public ref {{Generator.GetTypeName(type, i)}} ReadSecond<TSecond>(string first)
-                {
-                    Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-                public ref {{Generator.GetTypeName(type, i)}} ScopeOpen()
-                {
-                    Ecs.GetQueryBuilder(ref this).ScopeOpen();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-                public ref {{Generator.GetTypeName(type, i)}} ScopeClose()
-                {
-                    Ecs.GetQueryBuilder(ref this).ScopeClose();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-                public ref {{Generator.GetTypeName(type, i)}} Term()
-                {
-                    Ecs.GetQueryBuilder(ref this).Term();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} TermAt<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).TermAt<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-                public ref {{Generator.GetTypeName(type, i)}} TermAt(int termIndex)
-                {
-                    Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-                public ref {{Generator.GetTypeName(type, i)}} TermAt<T>(int termIndex)
-                {
-                    Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-                public ref {{Generator.GetTypeName(type, i)}} OrderBy(ulong component, Ecs.OrderByCallback callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-                public ref {{Generator.GetTypeName(type, i)}} OrderBy<T>(Ecs.OrderByCallback callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupBy(ulong component)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupBy(component);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupBy(ulong component, Ecs.GroupByCallback callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupBy<T>()
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupBy<T>(Ecs.GroupByCallback callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupByCtx<T>(T value)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-                public ref {{Generator.GetTypeName(type, i)}} GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-                public ref {{Generator.GetTypeName(type, i)}} OnGroupCreate(Ecs.GroupCreateCallback callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-                public ref {{Generator.GetTypeName(type, i)}} OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-                    return ref this;
-                }
-            
-                /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-                public ref {{Generator.GetTypeName(type, i)}} OnGroupDelete(Ecs.GroupDeleteCallback callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-                    return ref this;
-                }
-                
-                /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-                public ref {{Generator.GetTypeName(type, i)}} OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-                {
-                    Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-                    return ref this;
-                }
-            }
-            """;
-    }
-}
+using Flecs.NET.Codegen.Helpers;
+
+namespace Flecs.NET.Codegen.Generators;
+
+public class QueryBuilder : GeneratorBase
+{
+    public override void Generate()
+    {
+        for (int i = 0; i < Generator.GenericCount; i++)
+        {
+            AddSource($"QueryBuilder/T{i + 1}.g.cs", GenerateQueryBuilder(i));
+            AddSource($"QueryBuilder.QueryBuilder/T{i + 1}.g.cs", GenerateExtensions(Type.QueryBuilder, i));
+        }
+    }
+
+    private static string GenerateQueryBuilder(int i)
+    {
+        return $$"""
+            #nullable enable
+
+            using static Flecs.NET.Bindings.flecs;
+
+            namespace Flecs.NET.Core;
+
+            /// <summary>
+            ///     A type-safe wrapper around <see cref="QueryBuilder"/> that takes {{i + 1}} type arguments.
+            /// </summary>
+            /// {{Generator.XmlTypeParameters[i]}}
+            public unsafe partial struct {{Generator.GetTypeName(Type.QueryBuilder, i)}} : IQueryBuilder<{{Generator.GetTypeName(Type.QueryBuilder, i)}}, {{Generator.GetTypeName(Type.Query, i)}}>
+            {
+                private QueryBuilder _queryBuilder;
+            
+                ref QueryBuilder IQueryBuilderBase.QueryBuilder => ref _queryBuilder;
+                
+                /// <inheritdoc cref="QueryBuilder.World"/>
+                public ref ecs_world_t* World => ref _queryBuilder.World;
+                
+                /// <inheritdoc cref="QueryBuilder.Desc"/>
+                public ref ecs_query_desc_t Desc => ref _queryBuilder.Desc;
+            
+                /// <inheritdoc cref="QueryBuilder(ecs_world_t*)"/>
+                public QueryBuilder(ecs_world_t* world)
+                {
+                    {{Generator.GetTypeName(Type.TypeHelper, i)}}.AssertNoTags();
+                    _queryBuilder = new QueryBuilder(world){{Generator.WithChain[i]}};
+                }
+            
+                /// <inheritdoc cref="QueryBuilder(ecs_world_t*, ulong)"/>
+                public QueryBuilder(ecs_world_t* world, ulong entity)
+                {
+                    {{Generator.GetTypeName(Type.TypeHelper, i)}}.AssertNoTags();
+                    _queryBuilder = new QueryBuilder(world, entity){{Generator.WithChain[i]}};
+                }
+            
+                /// <inheritdoc cref="QueryBuilder(ecs_world_t*, string)"/>
+                public QueryBuilder(ecs_world_t* world, string name)
+                {
+                    {{Generator.GetTypeName(Type.TypeHelper, i)}}.AssertNoTags();
+                    _queryBuilder = new QueryBuilder(world, name){{Generator.WithChain[i]}};
+                }
+            
+                /// <inheritdoc cref="QueryBuilder.Build()"/>
+                public {{Generator.GetTypeName(Type.Query, i)}} Build()
+                {
+                    return new {{Generator.GetTypeName(Type.Query, i)}}(_queryBuilder.Build());
+                }
+                
+                /// <inheritdoc cref="QueryBuilder.Equals(QueryBuilder)"/>
+                public bool Equals({{Generator.GetTypeName(Type.QueryBuilder, i)}} other)
+                {
+                    return _queryBuilder == other._queryBuilder;
+                }
+            
+                /// <inheritdoc cref="QueryBuilder.Equals(object)"/>
+                public override bool Equals(object? obj)
+                {
+                    return obj is {{Generator.GetTypeName(Type.QueryBuilder, i)}}  other && Equals(other);
+                }
+            
+                /// <inheritdoc cref="QueryBuilder.GetHashCode()"/>
+                public override int GetHashCode()
+                {
+                    return _queryBuilder.GetHashCode();
+                }
+            
+                /// <inheritdoc cref="QueryBuilder.op_Equality"/>
+                public static bool operator ==({{Generator.GetTypeName(Type.QueryBuilder, i)}} left, {{Generator.GetTypeName(Type.QueryBuilder, i)}} right)
+                {
+                    return left.Equals(right);
+                }
+            
+                /// <inheritdoc cref="QueryBuilder.op_Inequality"/>
+                public static bool operator !=({{Generator.GetTypeName(Type.QueryBuilder, i)}} left, {{Generator.GetTypeName(Type.QueryBuilder, i)}} right)
+                {
+                    return !(left == right);
+                }
+            }
+            """;
+    }
+
+    public static string GenerateExtensions(Type type, int i = -1)
+    {
+        return $$"""
+            using System;
+            using static Flecs.NET.Bindings.flecs;
+
+            namespace Flecs.NET.Core;
+
+            public unsafe partial struct {{Generator.GetTypeName(type, i)}}
+            {
+                /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Self()
+                {
+                    Ecs.GetQueryBuilder(ref this).Self();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Id(ulong id)
+                {
+                    Ecs.GetQueryBuilder(ref this).Id(id);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Entity(ulong entity)
+                {
+                    Ecs.GetQueryBuilder(ref this).Entity(entity);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Name(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).Name(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Var(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).Var(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Term(ulong id)
+                {
+                    Ecs.GetQueryBuilder(ref this).Term(id);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Src()
+                {
+                    Ecs.GetQueryBuilder(ref this).Src();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+                public ref {{Generator.GetTypeName(type, i)}} First()
+                {
+                    Ecs.GetQueryBuilder(ref this).First();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Second()
+                {
+                    Ecs.GetQueryBuilder(ref this).Second();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Src(ulong srcId)
+                {
+                    Ecs.GetQueryBuilder(ref this).Src(srcId);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Src<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Src<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Src<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Src(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Src(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).Src(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} First(ulong firstId)
+                {
+                    Ecs.GetQueryBuilder(ref this).First(firstId);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} First<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).First<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} First<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).First(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} First(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).First(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Second(ulong secondId)
+                {
+                    Ecs.GetQueryBuilder(ref this).Second(secondId);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Second<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Second<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Second<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Second(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Second(string secondName)
+                {
+                    Ecs.GetQueryBuilder(ref this).Second(secondName);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Up(ulong traverse = 0)
+                {
+                    Ecs.GetQueryBuilder(ref this).Up(traverse);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Up<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Up<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Up<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Up(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Cascade(ulong traverse = 0)
+                {
+                    Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Cascade<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Cascade<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Cascade<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Cascade(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Descend()
+                {
+                    Ecs.GetQueryBuilder(ref this).Descend();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Parent()
+                {
+                    Ecs.GetQueryBuilder(ref this).Parent();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Trav(ulong traverse, uint flags = 0)
+                {
+                    Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Trav<T>(uint flags = 0)
+                {
+                    Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Trav<T>(T value, uint flags = 0) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+                public ref {{Generator.GetTypeName(type, i)}} Flags(ulong flags)
+                {
+                    Ecs.GetQueryBuilder(ref this).Flags(flags);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+                public ref {{Generator.GetTypeName(type, i)}} InOut(ecs_inout_kind_t inOut)
+                {
+                    Ecs.GetQueryBuilder(ref this).InOut(inOut);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+                public ref {{Generator.GetTypeName(type, i)}} InOutStage(ecs_inout_kind_t inOut)
+                {
+                    Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write()
+                {
+                    Ecs.GetQueryBuilder(ref this).Write();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read()
+                {
+                    Ecs.GetQueryBuilder(ref this).Read();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+                public ref {{Generator.GetTypeName(type, i)}} ReadWrite()
+                {
+                    Ecs.GetQueryBuilder(ref this).ReadWrite();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+                public ref {{Generator.GetTypeName(type, i)}} In()
+                {
+                    Ecs.GetQueryBuilder(ref this).In();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Out()
+                {
+                    Ecs.GetQueryBuilder(ref this).Out();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+                public ref {{Generator.GetTypeName(type, i)}} InOut()
+                {
+                    Ecs.GetQueryBuilder(ref this).InOut();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+                public ref {{Generator.GetTypeName(type, i)}} InOutNone()
+                {
+                    Ecs.GetQueryBuilder(ref this).InOutNone();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Oper(ecs_oper_kind_t oper)
+                {
+                    Ecs.GetQueryBuilder(ref this).Oper(oper);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+                public ref {{Generator.GetTypeName(type, i)}} And()
+                {
+                    Ecs.GetQueryBuilder(ref this).And();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Or()
+                {
+                    Ecs.GetQueryBuilder(ref this).Or();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Not()
+                {
+                    Ecs.GetQueryBuilder(ref this).Not();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Optional()
+                {
+                    Ecs.GetQueryBuilder(ref this).Optional();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+                public ref {{Generator.GetTypeName(type, i)}} AndFrom()
+                {
+                    Ecs.GetQueryBuilder(ref this).AndFrom();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+                public ref {{Generator.GetTypeName(type, i)}} OrFrom()
+                {
+                    Ecs.GetQueryBuilder(ref this).OrFrom();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+                public ref {{Generator.GetTypeName(type, i)}} NotFrom()
+                {
+                    Ecs.GetQueryBuilder(ref this).NotFrom();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Singleton()
+                {
+                    Ecs.GetQueryBuilder(ref this).Singleton();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Filter()
+                {
+                    Ecs.GetQueryBuilder(ref this).Filter();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+                public ref {{Generator.GetTypeName(type, i)}} QueryFlags(uint flags)
+                {
+                    Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+                public ref {{Generator.GetTypeName(type, i)}} CacheKind(ecs_query_cache_kind_t kind)
+                {
+                    Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Cached()
+                {
+                    Ecs.GetQueryBuilder(ref this).Cached();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Expr(string expr)
+                {
+                    Ecs.GetQueryBuilder(ref this).Expr(expr);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With(Term term)
+                {
+                    Ecs.GetQueryBuilder(ref this).With(term);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With(ulong id)
+                {
+                    Ecs.GetQueryBuilder(ref this).With(id);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).With(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With(ulong first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).With(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With(ulong first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).With(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With(string first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).With(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With(string first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).With(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).With<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).With(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<TFirst>(ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<TFirst>(string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<TFirst, TSecond>()
+                {
+                    Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<TFirst>(TFirst first, string second) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).With(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} With<TSecond>(string first, TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).With(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} WithSecond<TSecond>(ulong first)
+                {
+                    Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} WithSecond<TSecond>(string first)
+                {
+                    Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without(Term term)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(term);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without(ulong id)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(id);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without(ulong first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without(ulong first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without(string first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without(string first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Without<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst>(ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst>(string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst, TSecond>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<TFirst>(TFirst first, string second) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Without<TSecond>(string first, TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Without(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} WithoutSecond<TSecond>(ulong first)
+                {
+                    Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} WithoutSecond<TSecond>(string first)
+                {
+                    Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write(Term term)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(term);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write(ulong id)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(id);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write(ulong first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write(ulong first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write(string first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write(string first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Write<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst>(ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst>(string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst, TSecond>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<TFirst>(TFirst first, string second) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Write<TSecond>(string first, TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Write(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} WriteSecond<TSecond>(ulong first)
+                {
+                    Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} WriteSecond<TSecond>(string first)
+                {
+                    Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read(Term term)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(term);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read(ulong id)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(id);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read(string name)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(name);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read(ulong first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read(ulong first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read(string first, ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read(string first, string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Read<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<T>(T value) where T : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(value);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst>(ulong second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst>(string second)
+                {
+                    Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst, TSecond>()
+                {
+                    Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<TFirst>(TFirst first, string second) where TFirst : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+                public ref {{Generator.GetTypeName(type, i)}} Read<TSecond>(string first, TSecond second) where TSecond : Enum
+                {
+                    Ecs.GetQueryBuilder(ref this).Read(first, second);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} ReadSecond<TSecond>(ulong first)
+                {
+                    Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+                public ref {{Generator.GetTypeName(type, i)}} ReadSecond<TSecond>(string first)
+                {
+                    Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+                public ref {{Generator.GetTypeName(type, i)}} ScopeOpen()
+                {
+                    Ecs.GetQueryBuilder(ref this).ScopeOpen();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+                public ref {{Generator.GetTypeName(type, i)}} ScopeClose()
+                {
+                    Ecs.GetQueryBuilder(ref this).ScopeClose();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+                public ref {{Generator.GetTypeName(type, i)}} Term()
+                {
+                    Ecs.GetQueryBuilder(ref this).Term();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} TermAt<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).TermAt<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+                public ref {{Generator.GetTypeName(type, i)}} TermAt(int termIndex)
+                {
+                    Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+                public ref {{Generator.GetTypeName(type, i)}} TermAt<T>(int termIndex)
+                {
+                    Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+                public ref {{Generator.GetTypeName(type, i)}} OrderBy(ulong component, Ecs.OrderByCallback callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+                public ref {{Generator.GetTypeName(type, i)}} OrderBy<T>(Ecs.OrderByCallback callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupBy(ulong component)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupBy(component);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupBy(ulong component, Ecs.GroupByCallback callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupBy<T>()
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupBy<T>(Ecs.GroupByCallback callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupByCtx<T>(T value)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+                public ref {{Generator.GetTypeName(type, i)}} GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+                public ref {{Generator.GetTypeName(type, i)}} OnGroupCreate(Ecs.GroupCreateCallback callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+                public ref {{Generator.GetTypeName(type, i)}} OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+                    return ref this;
+                }
+            
+                /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+                public ref {{Generator.GetTypeName(type, i)}} OnGroupDelete(Ecs.GroupDeleteCallback callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+                    return ref this;
+                }
+                
+                /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+                public ref {{Generator.GetTypeName(type, i)}} OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+                {
+                    Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+                    return ref this;
+                }
+                
+                public ref {{Generator.GetTypeName(type, i)}} DetectChanges()
+                {
+                    Ecs.GetQueryBuilder(ref this).DetectChanges();
+                    return ref this;
+                }
+            }
+            """;
+    }
+}
diff --git a/src/Flecs.NET.Examples/Queries/ChangeTracking.cs b/src/Flecs.NET.Examples/Queries/ChangeTracking.cs
index 3d92498b..e0588705 100644
--- a/src/Flecs.NET.Examples/Queries/ChangeTracking.cs
+++ b/src/Flecs.NET.Examples/Queries/ChangeTracking.cs
@@ -1,140 +1,141 @@
-// Queries have a builtin mechanism for tracking changes per matched table. This
-// is a cheap way of eliminating redundant work, as many entities can be skipped
-// with a single check.
-//
-// This example shows how to use change tracking in combination with using
-// prefabs to store a single dirty state for multiple entities.
-
-using Flecs.NET.Core;
-
-// Components
-file record struct Position(float X, float Y);
-file record struct Dirty(bool Value);
-
-public static class Queries_ChangeTracking
-{
-    public static void Main()
-    {
-        using World world = World.Create();
-
-        // Make Dirty inheritable so that queries can match it on prefabs.
-        world.Component<Dirty>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        // Create a query that just reads a component. We'll use this query for
-        // change tracking. Change tracking for a query is automatically enabled
-        // when Query.Changed() is called.
-        // Each query has its own private dirty state which is reset only when the
-        // query is iterated.
-        using Query qRead = world.QueryBuilder()
-            .Cached()
-            .With<Position>().In()
-            .Build();
-
-        // Create a query that writes the component based on a Dirty state.
-        using Query<Dirty, Position> qWrite = world.QueryBuilder<Dirty, Position>()
-            .TermAt(0).Up(Ecs.IsA).In() // Only match Dirty from prefab
-            .Build();
-
-        // Create two prefabs with a Dirty component. We can use this to share a
-        // single Dirty value for all entities in a table.
-        Entity p1 = world.Prefab("p1").Set(new Dirty(false));
-        Entity p2 = world.Prefab("p2").Set(new Dirty(true));
-
-        // Create instances of p1 and p2. Because the entities have different
-        // prefabs, they end up in different tables.
-        world.Entity("e1").IsA(p1)
-            .Set(new Position(10, 20));
-
-        world.Entity("e2").IsA(p1)
-            .Set(new Position(30, 40));
-
-        world.Entity("e3").IsA(p2)
-            .Set(new Position(40, 50));
-
-        world.Entity("e4").IsA(p2)
-            .Set(new Position(60, 70));
-
-        // We can use the Changed() function on the query to check if any of the
-        // tables it is matched with has changed. Since this is the first time that
-        // we check this and the query is matched with the tables we just created,
-        // the function will return true.
-        Console.WriteLine($"qRead.Changed(): {qRead.Changed()}");
-
-        // The changed state will remain true until we have iterated each table.
-        qRead.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                // With the it.Changed() function we can check if the table we're
-                // currently iterating has changed since last iteration.
-                // Because this is the first time the query is iterated, all tables
-                // will show up as changed.
-                Console.WriteLine($"it.Changed() for table [{it.Type()}]: {it.Changed()}");
-            }
-        });
-
-        // Now that we have iterated all tables, the dirty state is reset.
-        Console.WriteLine($"qRead.Changed(): {qRead.Changed()}");
-        Console.WriteLine();
-
-        // Iterate the write query. Because the Position term is InOut (default)
-        // iterating the query will write to the dirty state of iterated tables.
-        qWrite.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Dirty> dirty = it.Field<Dirty>(0);
-                Field<Position> p = it.Field<Position>(1);
-
-                Console.WriteLine($"Iterate table [{it.Type()}]");
-
-                // Because we enforced that Dirty is a shared component, we can check
-                // a single value for the entire table.
-                if (!dirty[0].Value)
-                {
-                    // If the dirty flag is false, skip the table. This way the table's
-                    // dirty state is not updated by the query.
-                    it.Skip();
-
-                    Console.WriteLine($"it.Skip() for table [{it.Type()}]");
-
-                    // Cleanup iterator resources since iterator wasn't done yet.
-                    it.Fini();
-                    break;
-                }
-
-                // For all other tables the dirty state will be set.
-                foreach (int i in it)
-                {
-                    p[i].X++;
-                    p[i].Y++;
-                }
-            }
-        });
-
-        // One of the tables has changed, so q_read.changed() will return true
-        Console.WriteLine();
-        Console.WriteLine($"qRead.Changed()): {qRead.Changed()}");
-
-        // When we iterate the read query, we'll see that one table has changed.
-        qRead.Run((Iter it) =>
-        {
-            while (it.Next())
-                Console.WriteLine($"it.Changed() for table [{it.Type()}]: {it.Changed()}");
-        });
-    }
-}
-
-// Output:
-// qRead.Changed(): True
-// it.Changed() for table [Position, (Identifier,Name), (IsA,p1)]: True
-// it.Changed() for table [Position, (Identifier,Name), (IsA,p2)]: True
-// qRead.Changed(): False
-//
-// Iterate table [Position, (Identifier,Name), (IsA,p1)]
-// it.Skip() for table [Position, (Identifier,Name), (IsA,p1)]
-// Iterate table [Position, (Identifier,Name), (IsA,p2)]
-//
-// qRead.Changed()): True
-// it.Changed() for table [Position, (Identifier,Name), (IsA,p1)]: False
-// it.Changed() for table [Position, (Identifier,Name), (IsA,p2)]: True
+// Queries have a builtin mechanism for tracking changes per matched table. This
+// is a cheap way of eliminating redundant work, as many entities can be skipped
+// with a single check.
+//
+// This example shows how to use change tracking in combination with using
+// prefabs to store a single dirty state for multiple entities.
+
+using Flecs.NET.Core;
+
+// Components
+file record struct Position(float X, float Y);
+file record struct Dirty(bool Value);
+
+public static class Queries_ChangeTracking
+{
+    public static void Main()
+    {
+        using World world = World.Create();
+
+        // Make Dirty inheritable so that queries can match it on prefabs.
+        world.Component<Dirty>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        // Create a query that just reads a component. We'll use this query for
+        // change tracking. Change tracking for a query is automatically enabled
+        // when Query.Changed() is called.
+        // Each query has its own private dirty state which is reset only when the
+        // query is iterated.
+        using Query qRead = world.QueryBuilder()
+            .DetectChanges()
+            .Cached()
+            .With<Position>().In()
+            .Build();
+
+        // Create a query that writes the component based on a Dirty state.
+        using Query<Dirty, Position> qWrite = world.QueryBuilder<Dirty, Position>()
+            .TermAt(0).Up(Ecs.IsA).In() // Only match Dirty from prefab
+            .Build();
+
+        // Create two prefabs with a Dirty component. We can use this to share a
+        // single Dirty value for all entities in a table.
+        Entity p1 = world.Prefab("p1").Set(new Dirty(false));
+        Entity p2 = world.Prefab("p2").Set(new Dirty(true));
+
+        // Create instances of p1 and p2. Because the entities have different
+        // prefabs, they end up in different tables.
+        world.Entity("e1").IsA(p1)
+            .Set(new Position(10, 20));
+
+        world.Entity("e2").IsA(p1)
+            .Set(new Position(30, 40));
+
+        world.Entity("e3").IsA(p2)
+            .Set(new Position(40, 50));
+
+        world.Entity("e4").IsA(p2)
+            .Set(new Position(60, 70));
+
+        // We can use the Changed() function on the query to check if any of the
+        // tables it is matched with has changed. Since this is the first time that
+        // we check this and the query is matched with the tables we just created,
+        // the function will return true.
+        Console.WriteLine($"qRead.Changed(): {qRead.Changed()}");
+
+        // The changed state will remain true until we have iterated each table.
+        qRead.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                // With the it.Changed() function we can check if the table we're
+                // currently iterating has changed since last iteration.
+                // Because this is the first time the query is iterated, all tables
+                // will show up as changed.
+                Console.WriteLine($"it.Changed() for table [{it.Type()}]: {it.Changed()}");
+            }
+        });
+
+        // Now that we have iterated all tables, the dirty state is reset.
+        Console.WriteLine($"qRead.Changed(): {qRead.Changed()}");
+        Console.WriteLine();
+
+        // Iterate the write query. Because the Position term is InOut (default)
+        // iterating the query will write to the dirty state of iterated tables.
+        qWrite.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Dirty> dirty = it.Field<Dirty>(0);
+                Field<Position> p = it.Field<Position>(1);
+
+                Console.WriteLine($"Iterate table [{it.Type()}]");
+
+                // Because we enforced that Dirty is a shared component, we can check
+                // a single value for the entire table.
+                if (!dirty[0].Value)
+                {
+                    // If the dirty flag is false, skip the table. This way the table's
+                    // dirty state is not updated by the query.
+                    it.Skip();
+
+                    Console.WriteLine($"it.Skip() for table [{it.Type()}]");
+
+                    // Cleanup iterator resources since iterator wasn't done yet.
+                    it.Fini();
+                    break;
+                }
+
+                // For all other tables the dirty state will be set.
+                foreach (int i in it)
+                {
+                    p[i].X++;
+                    p[i].Y++;
+                }
+            }
+        });
+
+        // One of the tables has changed, so q_read.changed() will return true
+        Console.WriteLine();
+        Console.WriteLine($"qRead.Changed()): {qRead.Changed()}");
+
+        // When we iterate the read query, we'll see that one table has changed.
+        qRead.Run((Iter it) =>
+        {
+            while (it.Next())
+                Console.WriteLine($"it.Changed() for table [{it.Type()}]: {it.Changed()}");
+        });
+    }
+}
+
+// Output:
+// qRead.Changed(): True
+// it.Changed() for table [Position, (Identifier,Name), (IsA,p1)]: True
+// it.Changed() for table [Position, (Identifier,Name), (IsA,p2)]: True
+// qRead.Changed(): False
+//
+// Iterate table [Position, (Identifier,Name), (IsA,p1)]
+// it.Skip() for table [Position, (Identifier,Name), (IsA,p1)]
+// Iterate table [Position, (Identifier,Name), (IsA,p2)]
+//
+// qRead.Changed()): True
+// it.Changed() for table [Position, (Identifier,Name), (IsA,p1)]: False
+// it.Changed() for table [Position, (Identifier,Name), (IsA,p2)]: True
diff --git a/src/Flecs.NET.Examples/Relationships/Union.cs b/src/Flecs.NET.Examples/Relationships/Union.cs
deleted file mode 100644
index b9c8e564..00000000
--- a/src/Flecs.NET.Examples/Relationships/Union.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// This example shows how to use union relationships. Union relationships behave
-// much like exclusive relationships in that entities can have only one instance
-// and that adding an instance removes the previous instance.
-//
-// What makes union relationships stand out is that changing the relationship
-// target doesn't change the archetype of an entity. This allows for quick
-// switching of tags, which can be useful when encoding state machines in ECS.
-//
-// There is a tradeoff, and that is that because a single archetype can contain
-// entities with multiple targets, queries need to do a bit of extra work to
-// only return the requested target.
-//
-// This code uses enumeration relationships. See the EnumRelations example for
-// more details.
-
-using Flecs.NET.Core;
-
-// Enums
-file enum Movement
-{
-    Walking,
-    Running
-}
-
-file enum Direction
-{
-    Front,
-    Back,
-    Left,
-    Right
-}
-
-public static class Relationships_Union
-{
-    public static void Main()
-    {
-        using World world = World.Create();
-
-        world.Component<Movement>().Add(Ecs.Union);
-        world.Component<Direction>().Add(Ecs.Union);
-
-        // Create a query that subscribes for all entities that have a Direction
-        // and that are walking
-        using Query q = world.QueryBuilder()
-            .With(Movement.Walking)
-            .With<Direction>(Ecs.Wildcard)
-            .Build();
-
-        // Create a few entities with various state combinations
-        world.Entity("e1")
-            .Add(Movement.Walking)
-            .Add(Direction.Front);
-
-        world.Entity("e2")
-            .Add(Movement.Running)
-            .Add(Direction.Left);
-
-        Entity e3 = world.Entity("e3")
-            .Add(Movement.Running)
-            .Add(Direction.Back);
-
-        // Add Walking to e3. This will remove the Running case
-        e3.Add(Movement.Walking);
-
-        // Iterate the query
-        q.Each((Iter it, int i) =>
-        {
-            // Movement will always be Walking, Direction can be any state
-            Console.Write(it.Entity(i).Name());
-            Console.Write(": Movement: ");
-            Console.Write(it.Pair(0).Second().Name());
-            Console.Write(", Direction: ");
-            Console.Write(it.Pair(1).Second().Name());
-            Console.WriteLine();
-        });
-    }
-}
-
-// Output:
-// e3: Movement: Walking, Direction: Back
-// e1: Movement: Walking, Direction: Front
diff --git a/src/Flecs.NET.Native/build.zig b/src/Flecs.NET.Native/build.zig
index adf6abca..2c0533c7 100644
--- a/src/Flecs.NET.Native/build.zig
+++ b/src/Flecs.NET.Native/build.zig
@@ -1,261 +1,272 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const Build = std.Build;
-
-pub const LibraryType = enum { Shared, Static };
-
-const BuildOptions = struct {
-    optimize: std.builtin.OptimizeMode,
-    target: Build.ResolvedTarget,
-    library_type: LibraryType,
-    compiler_rt_path: ?[]const u8,
-};
-
-const src_flags = [_][]const u8{
-    "-std=c99",
-    "-fno-sanitize=undefined",
-};
-
-const src_files = [_][]const u8{
-    "../../native/flecs_helpers.c",
-
-    "../../native/flecs/src/bootstrap.c",
-    "../../native/flecs/src/each.c",
-    "../../native/flecs/src/entity_name.c",
-    "../../native/flecs/src/entity.c",
-    "../../native/flecs/src/id.c",
-    "../../native/flecs/src/iter.c",
-    "../../native/flecs/src/misc.c",
-    "../../native/flecs/src/observable.c",
-    "../../native/flecs/src/observer.c",
-    "../../native/flecs/src/os_api.c",
-    "../../native/flecs/src/poly.c",
-    "../../native/flecs/src/search.c",
-    "../../native/flecs/src/stage.c",
-    "../../native/flecs/src/value.c",
-    "../../native/flecs/src/world.c",
-    "../../native/flecs/src/addons/alerts.c",
-    "../../native/flecs/src/addons/app.c",
-    "../../native/flecs/src/addons/doc.c",
-    "../../native/flecs/src/addons/flecs_cpp.c",
-    "../../native/flecs/src/addons/http.c",
-    "../../native/flecs/src/addons/journal.c",
-    "../../native/flecs/src/addons/log.c",
-    "../../native/flecs/src/addons/metrics.c",
-    "../../native/flecs/src/addons/module.c",
-    "../../native/flecs/src/addons/rest.c",
-    "../../native/flecs/src/addons/timer.c",
-    "../../native/flecs/src/addons/units.c",
-    "../../native/flecs/src/addons/json/deserialize_value.c",
-    "../../native/flecs/src/addons/json/deserialize.c",
-    "../../native/flecs/src/addons/json/json.c",
-    "../../native/flecs/src/addons/json/serialize_entity.c",
-    "../../native/flecs/src/addons/json/serialize_field_info.c",
-    "../../native/flecs/src/addons/json/serialize_iter_result_query.c",
-    "../../native/flecs/src/addons/json/serialize_iter_result_table.c",
-    "../../native/flecs/src/addons/json/serialize_iter_result.c",
-    "../../native/flecs/src/addons/json/serialize_iter.c",
-    "../../native/flecs/src/addons/json/serialize_query_info.c",
-    "../../native/flecs/src/addons/json/serialize_type_info.c",
-    "../../native/flecs/src/addons/json/serialize_value.c",
-    "../../native/flecs/src/addons/json/serialize_world.c",
-    "../../native/flecs/src/addons/meta/api.c",
-    "../../native/flecs/src/addons/meta/c_utils.c",
-    "../../native/flecs/src/addons/meta/cursor.c",
-    "../../native/flecs/src/addons/meta/definitions.c",
-    "../../native/flecs/src/addons/meta/meta.c",
-    "../../native/flecs/src/addons/meta/rtt_lifecycle.c",
-    "../../native/flecs/src/addons/meta/serialized.c",
-    "../../native/flecs/src/addons/os_api_impl/os_api_impl.c",
-    "../../native/flecs/src/addons/parser/tokenizer.c",
-    "../../native/flecs/src/addons/pipeline/pipeline.c",
-    "../../native/flecs/src/addons/pipeline/worker.c",
-    "../../native/flecs/src/addons/query_dsl/parser.c",
-    "../../native/flecs/src/addons/script/ast.c",
-    "../../native/flecs/src/addons/script/function.c",
-    "../../native/flecs/src/addons/script/functions_builtin.c",
-    "../../native/flecs/src/addons/script/functions_math.c",
-    "../../native/flecs/src/addons/script/parser.c",
-    "../../native/flecs/src/addons/script/script.c",
-    "../../native/flecs/src/addons/script/serialize.c",
-    "../../native/flecs/src/addons/script/template.c",
-    "../../native/flecs/src/addons/script/vars.c",
-    "../../native/flecs/src/addons/script/visit_check.c",
-    "../../native/flecs/src/addons/script/visit_eval.c",
-    "../../native/flecs/src/addons/script/visit_free.c",
-    "../../native/flecs/src/addons/script/visit_to_str.c",
-    "../../native/flecs/src/addons/script/visit.c",
-    "../../native/flecs/src/addons/script/expr/ast.c",
-    "../../native/flecs/src/addons/script/expr/parser.c",
-    "../../native/flecs/src/addons/script/expr/stack.c",
-    "../../native/flecs/src/addons/script/expr/util.c",
-    "../../native/flecs/src/addons/script/expr/visit_eval.c",
-    "../../native/flecs/src/addons/script/expr/visit_fold.c",
-    "../../native/flecs/src/addons/script/expr/visit_free.c",
-    "../../native/flecs/src/addons/script/expr/visit_to_str.c",
-    "../../native/flecs/src/addons/script/expr/visit_type.c",
-    "../../native/flecs/src/addons/stats/monitor.c",
-    "../../native/flecs/src/addons/stats/pipeline_monitor.c",
-    "../../native/flecs/src/addons/stats/stats.c",
-    "../../native/flecs/src/addons/stats/system_monitor.c",
-    "../../native/flecs/src/addons/stats/world_monitor.c",
-    "../../native/flecs/src/addons/stats/world_summary.c",
-    "../../native/flecs/src/addons/system/system.c",
-    "../../native/flecs/src/datastructures/allocator.c",
-    "../../native/flecs/src/datastructures/bitset.c",
-    "../../native/flecs/src/datastructures/block_allocator.c",
-    "../../native/flecs/src/datastructures/hash.c",
-    "../../native/flecs/src/datastructures/hashmap.c",
-    "../../native/flecs/src/datastructures/map.c",
-    "../../native/flecs/src/datastructures/name_index.c",
-    "../../native/flecs/src/datastructures/sparse.c",
-    "../../native/flecs/src/datastructures/stack_allocator.c",
-    "../../native/flecs/src/datastructures/strbuf.c",
-    "../../native/flecs/src/datastructures/switch_list.c",
-    "../../native/flecs/src/datastructures/vec.c",
-    "../../native/flecs/src/query/api.c",
-    "../../native/flecs/src/query/util.c",
-    "../../native/flecs/src/query/validator.c",
-    "../../native/flecs/src/query/compiler/compiler_term.c",
-    "../../native/flecs/src/query/compiler/compiler.c",
-    "../../native/flecs/src/query/engine/cache_iter.c",
-    "../../native/flecs/src/query/engine/cache_order_by.c",
-    "../../native/flecs/src/query/engine/cache.c",
-    "../../native/flecs/src/query/engine/change_detection.c",
-    "../../native/flecs/src/query/engine/eval_iter.c",
-    "../../native/flecs/src/query/engine/eval_member.c",
-    "../../native/flecs/src/query/engine/eval_pred.c",
-    "../../native/flecs/src/query/engine/eval_toggle.c",
-    "../../native/flecs/src/query/engine/eval_trav.c",
-    "../../native/flecs/src/query/engine/eval_union.c",
-    "../../native/flecs/src/query/engine/eval_up.c",
-    "../../native/flecs/src/query/engine/eval_utils.c",
-    "../../native/flecs/src/query/engine/eval.c",
-    "../../native/flecs/src/query/engine/trav_cache.c",
-    "../../native/flecs/src/query/engine/trav_down_cache.c",
-    "../../native/flecs/src/query/engine/trav_up_cache.c",
-    "../../native/flecs/src/query/engine/trivial_iter.c",
-    "../../native/flecs/src/storage/entity_index.c",
-    "../../native/flecs/src/storage/id_index.c",
-    "../../native/flecs/src/storage/table_cache.c",
-    "../../native/flecs/src/storage/table_graph.c",
-    "../../native/flecs/src/storage/table.c",
-};
-
-pub fn compileFlecs(b: *Build, options: BuildOptions) void {
-    const lib = switch (options.library_type) {
-        .Shared => b.addSharedLibrary(.{
-            .name = "flecs",
-            .target = options.target,
-            .optimize = options.optimize,
-            .strip = options.optimize != .Debug,
-            .link_libc = true,
-        }),
-        .Static => b.addStaticLibrary(.{
-            .name = "flecs",
-            .target = options.target,
-            .optimize = options.optimize,
-            .strip = options.optimize != .Debug,
-            .link_libc = true,
-            .root_source_file = if (options.compiler_rt_path) |path| .{ .cwd_relative = path } else null,
-        }),
-    };
-
-    lib.defineCMacro(if (options.optimize == .Debug) "FLECS_DEBUG" else "FLECS_NDEBUG", null);
-    lib.defineCMacro(if (options.library_type == LibraryType.Shared) "flecs_EXPORTS" else "flecs_STATIC", null);
-
-    lib.addIncludePath(b.path("../../native/flecs/include"));
-
-    for (src_files) |file| {
-        lib.addCSourceFile(.{ .file = b.path(file), .flags = &src_flags });
-    }
-
-    switch (options.target.result.os.tag) {
-        .windows => {
-            lib.linkSystemLibrary("ws2_32");
-
-            // Temporary fix to get rid of undefined symbol errors when statically linking in Native AOT.
-            if (options.library_type == LibraryType.Static) {
-                lib.addCSourceFile(.{ .file = b.path("../../native/windows.c"), .flags = &src_flags });
-            }
-        },
-        .ios => {
-            if (b.sysroot == null) {
-                @panic("A --sysroot path to an IOS SDK needs to be provided when compiling for IOS.");
-            }
-
-            lib.addSystemFrameworkPath(.{ .cwd_relative = b.pathJoin(&.{ b.sysroot.?, "/System/Library/Frameworks" }) });
-            lib.addSystemIncludePath(.{ .cwd_relative = b.pathJoin(&.{ b.sysroot.?, "/usr/include" }) });
-            lib.addLibraryPath(.{ .cwd_relative = b.pathJoin(&.{ b.sysroot.?, "/usr/lib" }) });
-        },
-        .emscripten => {
-            if (b.sysroot == null) {
-                @panic("Pass '--sysroot \"$EMSDK/upstream/emscripten\"'");
-            }
-
-            const cache_include = b.pathJoin(&.{ b.sysroot.?, "cache", "sysroot", "include" });
-            var dir = std.fs.openDirAbsolute(cache_include, std.fs.Dir.OpenDirOptions{ .access_sub_paths = true, .no_follow = true }) catch @panic("No emscripten cache. Generate it!");
-            dir.close();
-            lib.addIncludePath(.{ .cwd_relative = cache_include });
-        },
-        .linux => {
-            if (options.target.result.abi == .android) {
-                if (b.sysroot == null) {
-                    @panic("A --sysroot path to an Android NDK needs to be provided when compiling for Android.");
-                }
-
-                const host_tuple = switch (builtin.target.os.tag) {
-                    .linux => "linux-x86_64",
-                    .windows => "windows-x86_64",
-                    .macos => "darwin-x86_64",
-                    else => @panic("unsupported host OS"),
-                };
-
-                const triple = switch (options.target.result.cpu.arch) {
-                    .aarch64 => "aarch64-linux-android",
-                    .x86_64 => "x86_64-linux-android",
-                    else => @panic("Unsupported Android architecture"),
-                };
-                const android_api_level: []const u8 = "21";
-
-                const android_sysroot = b.pathJoin(&.{ b.sysroot.?, "/toolchains/llvm/prebuilt/", host_tuple, "/sysroot" });
-                const android_lib_path = b.pathJoin(&.{ android_sysroot, "/usr/lib/", triple, android_api_level });
-                const android_include_path = b.pathJoin(&.{ android_sysroot, "/usr/include" });
-                const android_system_include_path = b.pathJoin(&.{ android_sysroot, "/usr/include/", triple });
-
-                lib.addLibraryPath(.{ .cwd_relative = android_lib_path });
-
-                const libc_file_name = "android-libc.conf";
-                var libc_content = std.ArrayList(u8).init(b.allocator);
-                errdefer libc_content.deinit();
-
-                const writer = libc_content.writer();
-                const libc_installation = std.zig.LibCInstallation{
-                    .include_dir = android_include_path,
-                    .sys_include_dir = android_system_include_path,
-                    .crt_dir = android_lib_path,
-                };
-                libc_installation.render(writer) catch @panic("Failed to render libc");
-                const libc_path = b.addWriteFiles().add(libc_file_name, libc_content.items);
-
-                lib.setLibCFile(libc_path);
-                lib.libc_file.?.addStepDependencies(&lib.step);
-            }
-        },
-        else => {},
-    }
-
-    b.installArtifact(lib);
-}
-
-pub fn build(b: *Build) void {
-    compileFlecs(b, .{
-        .optimize = b.standardOptimizeOption(.{}),
-        .target = b.standardTargetOptions(.{}),
-        .library_type = b.option(LibraryType, "library-type", "Compile as a static or shared library.") orelse LibraryType.Shared,
-        // When building static libraries for Windows, zig's compiler-rt needs to be bundled.
-        // For some reason, setting "bundle_compiler_rt" to true doesn't produce a static library that works with NativeAOT.
-        // As a work-around, we manually build the compiler_rt.zig file alongside flecs.
-        .compiler_rt_path = b.option([]const u8, "compiler-rt-path", "Path to the compiler_rt file.") orelse null,
-    });
-}
+const std = @import("std");
+const builtin = @import("builtin");
+const Build = std.Build;
+
+pub const LibraryType = enum { Shared, Static };
+
+const BuildOptions = struct {
+    optimize: std.builtin.OptimizeMode,
+    target: Build.ResolvedTarget,
+    library_type: LibraryType,
+    compiler_rt_path: ?[]const u8,
+};
+
+const src_flags = [_][]const u8{
+    "-std=c99",
+    "-fno-sanitize=undefined",
+};
+
+const src_files = [_][]const u8{
+    "../../native/flecs_helpers.c",
+
+    "../../native/flecs/src/bootstrap.c",
+    "../../native/flecs/src/commands.c",
+    "../../native/flecs/src/component_actions.c",
+    "../../native/flecs/src/each.c",
+    "../../native/flecs/src/entity_name.c",
+    "../../native/flecs/src/entity.c",
+    "../../native/flecs/src/id.c",
+    "../../native/flecs/src/instantiate.c",
+    "../../native/flecs/src/iter.c",
+    "../../native/flecs/src/misc.c",
+    "../../native/flecs/src/observable.c",
+    "../../native/flecs/src/observer.c",
+    "../../native/flecs/src/on_delete.c",
+    "../../native/flecs/src/os_api.c",
+    "../../native/flecs/src/poly.c",
+    "../../native/flecs/src/ref.c",
+    "../../native/flecs/src/search.c",
+    "../../native/flecs/src/stage.c",
+    "../../native/flecs/src/type_info.c",
+    "../../native/flecs/src/value.c",
+    "../../native/flecs/src/world.c",
+    "../../native/flecs/src/addons/alerts.c",
+    "../../native/flecs/src/addons/app.c",
+    "../../native/flecs/src/addons/doc.c",
+    "../../native/flecs/src/addons/flecs_cpp.c",
+    "../../native/flecs/src/addons/http.c",
+    "../../native/flecs/src/addons/journal.c",
+    "../../native/flecs/src/addons/log.c",
+    "../../native/flecs/src/addons/metrics.c",
+    "../../native/flecs/src/addons/module.c",
+    "../../native/flecs/src/addons/rest.c",
+    "../../native/flecs/src/addons/timer.c",
+    "../../native/flecs/src/addons/units.c",
+    "../../native/flecs/src/addons/json/deserialize_value.c",
+    "../../native/flecs/src/addons/json/deserialize.c",
+    "../../native/flecs/src/addons/json/json.c",
+    "../../native/flecs/src/addons/json/serialize_entity.c",
+    "../../native/flecs/src/addons/json/serialize_field_info.c",
+    "../../native/flecs/src/addons/json/serialize_iter_result_query.c",
+    "../../native/flecs/src/addons/json/serialize_iter_result_table.c",
+    "../../native/flecs/src/addons/json/serialize_iter_result.c",
+    "../../native/flecs/src/addons/json/serialize_iter.c",
+    "../../native/flecs/src/addons/json/serialize_query_info.c",
+    "../../native/flecs/src/addons/json/serialize_type_info.c",
+    "../../native/flecs/src/addons/json/serialize_value.c",
+    "../../native/flecs/src/addons/json/serialize_world.c",
+    "../../native/flecs/src/addons/meta/api.c",
+    "../../native/flecs/src/addons/meta/c_utils.c",
+    "../../native/flecs/src/addons/meta/cursor.c",
+    "../../native/flecs/src/addons/meta/definitions.c",
+    "../../native/flecs/src/addons/meta/meta.c",
+    "../../native/flecs/src/addons/meta/rtt_lifecycle.c",
+    "../../native/flecs/src/addons/meta/serialized.c",
+    "../../native/flecs/src/addons/os_api_impl/os_api_impl.c",
+    "../../native/flecs/src/addons/parser/tokenizer.c",
+    "../../native/flecs/src/addons/pipeline/frame.c",
+    "../../native/flecs/src/addons/pipeline/pipeline.c",
+    "../../native/flecs/src/addons/pipeline/worker.c",
+    "../../native/flecs/src/addons/query_dsl/parser.c",
+    "../../native/flecs/src/addons/script/ast.c",
+    "../../native/flecs/src/addons/script/function.c",
+    "../../native/flecs/src/addons/script/functions_builtin.c",
+    "../../native/flecs/src/addons/script/functions_math.c",
+    "../../native/flecs/src/addons/script/parser.c",
+    "../../native/flecs/src/addons/script/script.c",
+    "../../native/flecs/src/addons/script/serialize.c",
+    "../../native/flecs/src/addons/script/template.c",
+    "../../native/flecs/src/addons/script/vars.c",
+    "../../native/flecs/src/addons/script/visit_check.c",
+    "../../native/flecs/src/addons/script/visit_eval.c",
+    "../../native/flecs/src/addons/script/visit_free.c",
+    "../../native/flecs/src/addons/script/visit_to_str.c",
+    "../../native/flecs/src/addons/script/visit.c",
+    "../../native/flecs/src/addons/script/expr/ast.c",
+    "../../native/flecs/src/addons/script/expr/parser.c",
+    "../../native/flecs/src/addons/script/expr/stack.c",
+    "../../native/flecs/src/addons/script/expr/util.c",
+    "../../native/flecs/src/addons/script/expr/visit_eval.c",
+    "../../native/flecs/src/addons/script/expr/visit_fold.c",
+    "../../native/flecs/src/addons/script/expr/visit_free.c",
+    "../../native/flecs/src/addons/script/expr/visit_to_str.c",
+    "../../native/flecs/src/addons/script/expr/visit_type.c",
+    "../../native/flecs/src/addons/stats/monitor.c",
+    "../../native/flecs/src/addons/stats/pipeline_monitor.c",
+    "../../native/flecs/src/addons/stats/stats.c",
+    "../../native/flecs/src/addons/stats/system_monitor.c",
+    "../../native/flecs/src/addons/stats/world_monitor.c",
+    "../../native/flecs/src/addons/stats/world_summary.c",
+    "../../native/flecs/src/addons/system/system.c",
+    "../../native/flecs/src/datastructures/allocator.c",
+    "../../native/flecs/src/datastructures/bitset.c",
+    "../../native/flecs/src/datastructures/block_allocator.c",
+    "../../native/flecs/src/datastructures/hash.c",
+    "../../native/flecs/src/datastructures/hashmap.c",
+    "../../native/flecs/src/datastructures/map.c",
+    "../../native/flecs/src/datastructures/name_index.c",
+    "../../native/flecs/src/datastructures/sparse.c",
+    "../../native/flecs/src/datastructures/stack_allocator.c",
+    "../../native/flecs/src/datastructures/strbuf.c",
+    "../../native/flecs/src/datastructures/vec.c",
+    "../../native/flecs/src/query/api.c",
+    "../../native/flecs/src/query/util.c",
+    "../../native/flecs/src/query/validator.c",
+    "../../native/flecs/src/query/cache/cache.c",
+    "../../native/flecs/src/query/cache/cache_iter.c",
+    "../../native/flecs/src/query/cache/change_detection.c",
+    "../../native/flecs/src/query/cache/group.c",
+    "../../native/flecs/src/query/cache/match.c",
+    "../../native/flecs/src/query/cache/order_by.c",
+    "../../native/flecs/src/query/compiler/compiler_term.c",
+    "../../native/flecs/src/query/compiler/compiler.c",
+    "../../native/flecs/src/query/engine/eval_iter.c",
+    "../../native/flecs/src/query/engine/eval_member.c",
+    "../../native/flecs/src/query/engine/eval_pred.c",
+    "../../native/flecs/src/query/engine/eval_sparse.c",
+    "../../native/flecs/src/query/engine/eval_toggle.c",
+    "../../native/flecs/src/query/engine/eval_trav.c",
+    "../../native/flecs/src/query/engine/eval_up.c",
+    "../../native/flecs/src/query/engine/eval_utils.c",
+    "../../native/flecs/src/query/engine/eval.c",
+    "../../native/flecs/src/query/engine/trav_cache.c",
+    "../../native/flecs/src/query/engine/trav_down_cache.c",
+    "../../native/flecs/src/query/engine/trav_up_cache.c",
+    "../../native/flecs/src/query/engine/trivial_iter.c",
+    "../../native/flecs/src/storage/component_index.c",
+    "../../native/flecs/src/storage/entity_index.c",
+    "../../native/flecs/src/storage/ordered_children.c",
+    "../../native/flecs/src/storage/sparse_storage.c",
+    "../../native/flecs/src/storage/table_cache.c",
+    "../../native/flecs/src/storage/table_graph.c",
+    "../../native/flecs/src/storage/table.c",
+};
+
+pub fn compileFlecs(b: *Build, options: BuildOptions) void {
+    const lib = switch (options.library_type) {
+        .Shared => b.addSharedLibrary(.{
+            .name = "flecs",
+            .target = options.target,
+            .optimize = options.optimize,
+            .strip = options.optimize != .Debug,
+            .link_libc = true,
+        }),
+        .Static => b.addStaticLibrary(.{
+            .name = "flecs",
+            .target = options.target,
+            .optimize = options.optimize,
+            .strip = options.optimize != .Debug,
+            .link_libc = true,
+            .root_source_file = if (options.compiler_rt_path) |path| .{ .cwd_relative = path } else null,
+        }),
+    };
+
+    lib.defineCMacro(if (options.optimize == .Debug) "FLECS_DEBUG" else "FLECS_NDEBUG", null);
+    lib.defineCMacro(if (options.library_type == LibraryType.Shared) "flecs_EXPORTS" else "flecs_STATIC", null);
+    lib.defineCMacro("FLECS_SCRIPT_MATH", null);
+
+    lib.addIncludePath(b.path("../../native/flecs/include"));
+
+    for (src_files) |file| {
+        lib.addCSourceFile(.{ .file = b.path(file), .flags = &src_flags });
+    }
+
+    switch (options.target.result.os.tag) {
+        .windows => {
+            lib.linkSystemLibrary("ws2_32");
+
+            // Temporary fix to get rid of undefined symbol errors when statically linking in Native AOT.
+            if (options.library_type == LibraryType.Static) {
+                lib.addCSourceFile(.{ .file = b.path("../../native/windows.c"), .flags = &src_flags });
+            }
+        },
+        .ios => {
+            if (b.sysroot == null) {
+                @panic("A --sysroot path to an IOS SDK needs to be provided when compiling for IOS.");
+            }
+
+            lib.addSystemFrameworkPath(.{ .cwd_relative = b.pathJoin(&.{ b.sysroot.?, "/System/Library/Frameworks" }) });
+            lib.addSystemIncludePath(.{ .cwd_relative = b.pathJoin(&.{ b.sysroot.?, "/usr/include" }) });
+            lib.addLibraryPath(.{ .cwd_relative = b.pathJoin(&.{ b.sysroot.?, "/usr/lib" }) });
+        },
+        .emscripten => {
+            if (b.sysroot == null) {
+                @panic("Pass '--sysroot \"$EMSDK/upstream/emscripten\"'");
+            }
+
+            const cache_include = b.pathJoin(&.{ b.sysroot.?, "cache", "sysroot", "include" });
+            var dir = std.fs.openDirAbsolute(cache_include, std.fs.Dir.OpenDirOptions{ .access_sub_paths = true, .no_follow = true }) catch @panic("No emscripten cache. Generate it!");
+            dir.close();
+            lib.addIncludePath(.{ .cwd_relative = cache_include });
+        },
+        .linux => {
+            if (options.target.result.abi == .android) {
+                if (b.sysroot == null) {
+                    @panic("A --sysroot path to an Android NDK needs to be provided when compiling for Android.");
+                }
+
+                const host_tuple = switch (builtin.target.os.tag) {
+                    .linux => "linux-x86_64",
+                    .windows => "windows-x86_64",
+                    .macos => "darwin-x86_64",
+                    else => @panic("unsupported host OS"),
+                };
+
+                const triple = switch (options.target.result.cpu.arch) {
+                    .aarch64 => "aarch64-linux-android",
+                    .x86_64 => "x86_64-linux-android",
+                    else => @panic("Unsupported Android architecture"),
+                };
+                const android_api_level: []const u8 = "21";
+
+                const android_sysroot = b.pathJoin(&.{ b.sysroot.?, "/toolchains/llvm/prebuilt/", host_tuple, "/sysroot" });
+                const android_lib_path = b.pathJoin(&.{ android_sysroot, "/usr/lib/", triple, android_api_level });
+                const android_include_path = b.pathJoin(&.{ android_sysroot, "/usr/include" });
+                const android_system_include_path = b.pathJoin(&.{ android_sysroot, "/usr/include/", triple });
+
+                lib.addLibraryPath(.{ .cwd_relative = android_lib_path });
+
+                const libc_file_name = "android-libc.conf";
+                var libc_content = std.ArrayList(u8).init(b.allocator);
+                errdefer libc_content.deinit();
+
+                const writer = libc_content.writer();
+                const libc_installation = std.zig.LibCInstallation{
+                    .include_dir = android_include_path,
+                    .sys_include_dir = android_system_include_path,
+                    .crt_dir = android_lib_path,
+                };
+                libc_installation.render(writer) catch @panic("Failed to render libc");
+                const libc_path = b.addWriteFiles().add(libc_file_name, libc_content.items);
+
+                lib.setLibCFile(libc_path);
+                lib.libc_file.?.addStepDependencies(&lib.step);
+            }
+        },
+        else => {},
+    }
+
+    b.installArtifact(lib);
+}
+
+pub fn build(b: *Build) void {
+    compileFlecs(b, .{
+        .optimize = b.standardOptimizeOption(.{}),
+        .target = b.standardTargetOptions(.{}),
+        .library_type = b.option(LibraryType, "library-type", "Compile as a static or shared library.") orelse LibraryType.Shared,
+        // When building static libraries for Windows, zig's compiler-rt needs to be bundled.
+        // For some reason, setting "bundle_compiler_rt" to true doesn't produce a static library that works with NativeAOT.
+        // As a work-around, we manually build the compiler_rt.zig file alongside flecs.
+        .compiler_rt_path = b.option([]const u8, "compiler-rt-path", "Path to the compiler_rt file.") orelse null,
+    });
+}
diff --git a/src/Flecs.NET.Tests/CSharp/Core/ExampleTests.cs b/src/Flecs.NET.Tests/CSharp/Core/ExampleTests.cs
index ac48211d..da9a2849 100644
--- a/src/Flecs.NET.Tests/CSharp/Core/ExampleTests.cs
+++ b/src/Flecs.NET.Tests/CSharp/Core/ExampleTests.cs
@@ -1,537 +1,531 @@
-using Xunit;
-
-namespace Flecs.NET.Tests.CSharp.Core;
-
-// Parallelization needs to be disabled for this test collection because Ecs.Log functions aren't thread safe.
-[Collection(nameof(ExampleTests))]
-[CollectionDefinition(nameof(ExampleTests), DisableParallelization = true)]
-public class ExampleTests
-{
-    [Fact]
-    private void HelloWorld()
-    {
-        global::HelloWorld.Main();
-    }
-
-    [Fact]
-    private void SimpleModule()
-    {
-        global::SimpleModule.Main();
-    }
-
-    [Fact]
-    private void Entities_Basics()
-    {
-        global::Entities_Basics.Main();
-    }
-
-    [Fact]
-    private void Entities_Hierarchy()
-    {
-        global::Entities_Hierarchy.Main();
-    }
-
-    [Fact]
-    private void Entities_Hooks()
-    {
-        global::Entities_Hooks.Main();
-    }
-
-    [Fact]
-    private void Entities_IterateComponents()
-    {
-        global::Entities_IterateComponents.Main();
-    }
-
-    [Fact]
-    private void Entities_MultiSetGet()
-    {
-        global::Entities_MultiSetGet.Main();
-    }
-
-    [Fact]
-    private void Entities_Prefab()
-    {
-        global::Entities_Prefab.Main();
-    }
-
-    [Fact]
-    private void Entities_SettingComponents()
-    {
-        global::Entities_SettingComponents.Main();
-    }
-
-    [Fact]
-    private void GameMechanics_InventorySystem()
-    {
-        global::GameMechanics_InventorySystem.Main();
-    }
-
-    [Fact]
-    private void GameMechanics_SceneManagement()
-    {
-        global::GameMechanics_SceneManagement.Main();
-    }
-
-    [Fact]
-    private void Observers_Basics()
-    {
-        global::Observers_Basics.Main();
-    }
-
-    [Fact]
-    private void Observers_CustomEvent()
-    {
-        global::Observers_CustomEvent.Main();
-    }
-
-    [Fact]
-    private void Observers_EnqueueEntityEvent()
-    {
-        global::Observers_EnqueueEntityEvent.Main();
-    }
-
-    [Fact]
-    private void Observers_EnqueueEvent()
-    {
-        global::Observers_EnqueueEvent.Main();
-    }
-
-    [Fact]
-    private void Observers_EntityEvent()
-    {
-        global::Observers_EntityEvent.Main();
-    }
-
-    [Fact]
-    private void Observers_Monitor()
-    {
-        global::Observers_Monitor.Main();
-    }
-
-    [Fact]
-    private void Observers_Propagate()
-    {
-        global::Observers_Propagate.Main();
-    }
-
-    [Fact]
-    private void Observers_TwoComponents()
-    {
-        global::Observers_TwoComponents.Main();
-    }
-
-    [Fact]
-    private void Observers_YieldExisting()
-    {
-        global::Observers_YieldExisting.Main();
-    }
-
-    [Fact]
-    private void Prefabs_Basics()
-    {
-        global::Prefabs_Basics.Main();
-    }
-
-    [Fact]
-    private void Prefabs_Hierarchy()
-    {
-        global::Prefabs_Hierarchy.Main();
-    }
-
-    [Fact]
-    private void Prefabs_NestedPrefabs()
-    {
-        global::Prefabs_NestedPrefabs.Main();
-    }
-
-    [Fact]
-    private void Prefabs_Override()
-    {
-        global::Prefabs_Override.Main();
-    }
-
-    [Fact]
-    private void Prefabs_Slots()
-    {
-        global::Prefabs_Slots.Main();
-    }
-
-    [Fact]
-    private void Prefabs_TypedPrefabs()
-    {
-        global::Prefabs_TypedPrefabs.Main();
-    }
-
-    [Fact]
-    private void Prefabs_Variant()
-    {
-        global::Prefabs_Variant.Main();
-    }
-
-    [Fact]
-    private void Queries_BasicIteration()
-    {
-        global::Queries_BasicIteration.Main();
-    }
-
-    [Fact]
-    private void Queries_Basics()
-    {
-        global::Queries_Basics.Main();
-    }
-
-    [Fact]
-    private void Queries_ChangeTracking()
-    {
-        global::Queries_ChangeTracking.Main();
-    }
-
-    [Fact]
-    private void Queries_ComponentInheritance()
-    {
-        global::Queries_ComponentInheritance.Main();
-    }
-
-    [Fact]
-    private void Queries_CyclicVariables()
-    {
-        global::Queries_CyclicVariables.Main();
-    }
-
-    [Fact]
-    private void Queries_Facts()
-    {
-        global::Queries_Facts.Main();
-    }
-
-    [Fact]
-    private void Queries_FindEntity()
-    {
-        global::Queries_FindEntity.Main();
-    }
-
-    [Fact]
-    private void Queries_GroupBy()
-    {
-        global::Queries_GroupBy.Main();
-    }
-
-    [Fact]
-    private void Queries_GroupByCallbacks()
-    {
-        global::Queries_GroupByCallbacks.Main();
-    }
-
-    [Fact]
-    private void Queries_GroupByCustom()
-    {
-        global::Queries_GroupByCustom.Main();
-    }
-
-    [Fact]
-    private void Queries_GroupIter()
-    {
-        global::Queries_GroupIter.Main();
-    }
-
-    [Fact]
-    private void Queries_Hierarchy()
-    {
-        global::Queries_Hierarchy.Main();
-    }
-
-    [Fact]
-    private void Queries_Iter()
-    {
-        global::Queries_Iter.Main();
-    }
-
-    [Fact]
-    private void Queries_IterTargets()
-    {
-        global::Queries_IterTargets.Main();
-    }
-
-    [Fact]
-    private void Queries_SettingVariables()
-    {
-        global::Queries_SettingVariables.Main();
-    }
-
-    [Fact]
-    private void Queries_Singleton()
-    {
-        global::Queries_Singleton.Main();
-    }
-
-    [Fact]
-    private void Queries_Sorting()
-    {
-        global::Queries_Sorting.Main();
-    }
-
-    [Fact]
-    private void Queries_TransitiveQueries()
-    {
-        global::Queries_TransitiveQueries.Main();
-    }
-
-    [Fact]
-    private void Queries_Variables()
-    {
-        global::Queries_Variables.Main();
-    }
-
-    [Fact]
-    private void Queries_Wildcards()
-    {
-        global::Queries_Wildcards.Main();
-    }
-
-    [Fact]
-    private void Queries_With()
-    {
-        global::Queries_With.Main();
-    }
-
-    [Fact]
-    private void Queries_Without()
-    {
-        global::Queries_Without.Main();
-    }
-
-    [Fact]
-    private void Queries_WorldQuery()
-    {
-        global::Queries_WorldQuery.Main();
-    }
-
-    [Fact]
-    private void Reflection_Basics()
-    {
-        global::Reflection_Basics.Main();
-    }
-
-    [Fact]
-    private void Reflection_BasicsBitmask()
-    {
-        global::Reflection_BasicsBitmask.Main();
-    }
-
-    [Fact]
-    private void Reflection_BasicsDeserialize()
-    {
-        global::Reflection_BasicsDeserialize.Main();
-    }
-
-    [Fact]
-    private void Reflection_BasicsEnum()
-    {
-        global::Reflection_BasicsEnum.Main();
-    }
-
-    [Fact]
-    private void Reflection_BasicsJson()
-    {
-        global::Reflection_BasicsJson.Main();
-    }
-
-    [Fact]
-    private void Reflection_EntityType()
-    {
-        global::Reflection_EntityType.Main();
-    }
-
-    [Fact]
-    private void Reflection_MemberRanges()
-    {
-        global::Reflection_MemberRanges.Main();
-    }
-
-    [Fact]
-    private void Reflection_NestedSetMember()
-    {
-        global::Reflection_NestedSetMember.Main();
-    }
-
-    [Fact]
-    private void Reflection_NestedStruct()
-    {
-        global::Reflection_NestedStruct.Main();
-    }
-
-    [Fact]
-    private void Reflection_QueryToCustomJson()
-    {
-        global::Reflection_QueryToCustomJson.Main();
-    }
-
-    [Fact]
-    private void Reflection_QueryToJson()
-    {
-        global::Reflection_QueryToJson.Main();
-    }
-
-    [Fact]
-    private void Reflection_RuntimeComponent()
-    {
-        global::Reflection_RuntimeComponent.Main();
-    }
-
-    [Fact]
-    private void Reflection_RuntimeNestedComponent()
-    {
-        global::Reflection_RuntimeNestedComponent.Main();
-    }
-
-    [Fact]
-    private void Reflection_Units()
-    {
-        global::Reflection_Units.Main();
-    }
-
-    [Fact]
-    private void Reflection_WorldSerializeDeserialize()
-    {
-        global::Reflection_WorldSerializeDeserialize.Main();
-    }
-
-    [Fact]
-    private void Relationships_Basics()
-    {
-        global::Relationships_Basics.Main();
-    }
-
-    [Fact]
-    private void Relationships_EnumRelations()
-    {
-        global::Relationships_EnumRelations.Main();
-    }
-
-    [Fact]
-    private void Relationships_ExclusiveRelations()
-    {
-        global::Relationships_ExclusiveRelations.Main();
-    }
-
-    [Fact]
-    private void Relationships_RelationComponent()
-    {
-        global::Relationships_RelationComponent.Main();
-    }
-
-    [Fact]
-    private void Relationships_SymmetricRelations()
-    {
-        global::Relationships_SymmetricRelations.Main();
-    }
-
-    [Fact]
-    private void Relationships_Union()
-    {
-        global::Relationships_Union.Main();
-    }
-
-    [Fact]
-    private void Systems_Basics()
-    {
-        global::Systems_Basics.Main();
-    }
-
-    [Fact]
-    private void Systems_CustomPhases()
-    {
-        global::Systems_CustomPhases.Main();
-    }
-
-    [Fact]
-    private void Systems_CustomPhasesNoBuiltIn()
-    {
-        global::Systems_CustomPhasesNoBuiltIn.Main();
-    }
-
-    [Fact]
-    private void Systems_CustomPipeline()
-    {
-        global::Systems_CustomPipeline.Main();
-    }
-
-    [Fact]
-    private void Systems_CustomRunner()
-    {
-        global::Systems_CustomRunner.Main();
-    }
-
-    [Fact]
-    private void Systems_DeltaTime()
-    {
-        global::Systems_DeltaTime.Main();
-    }
-
-    [Fact]
-    private void Systems_Immediate()
-    {
-        global::Systems_Immediate.Main();
-    }
-
-    [Fact]
-    private void Systems_MutateEntity()
-    {
-        global::Systems_MutateEntity.Main();
-    }
-
-    [Fact]
-    private void Systems_MutateEntityHandle()
-    {
-        global::Systems_MutateEntityHandle.Main();
-    }
-
-    [Fact]
-    private void Systems_Pipeline()
-    {
-        global::Systems_Pipeline.Main();
-    }
-
-    [Fact]
-    private void Systems_RunWithCallback()
-    {
-        global::Systems_RunWithCallback.Main();
-    }
-
-    [Fact]
-    private void Systems_StartupSystem()
-    {
-        global::Systems_StartupSystem.Main();
-    }
-
-    [Fact]
-    private void Systems_SyncPoint()
-    {
-        global::Systems_SyncPoint.Main();
-    }
-
-    [Fact]
-    private void Systems_SyncPointDelete()
-    {
-        global::Systems_SyncPointDelete.Main();
-    }
-
-    [Fact]
-    private void Systems_SystemCtx()
-    {
-        global::Systems_SystemCtx.Main();
-    }
-
-    [Fact]
-    private void Systems_TargetFps()
-    {
-        global::Systems_TargetFps.Main();
-    }
-
-    [Fact]
-    private void Systems_TimeInterval()
-    {
-        global::Systems_TimeInterval.Main();
-    }
-}
+using Xunit;
+
+namespace Flecs.NET.Tests.CSharp.Core;
+
+// Parallelization needs to be disabled for this test collection because Ecs.Log functions aren't thread safe.
+[Collection(nameof(ExampleTests))]
+[CollectionDefinition(nameof(ExampleTests), DisableParallelization = true)]
+public class ExampleTests
+{
+    [Fact]
+    private void HelloWorld()
+    {
+        global::HelloWorld.Main();
+    }
+
+    [Fact]
+    private void SimpleModule()
+    {
+        global::SimpleModule.Main();
+    }
+
+    [Fact]
+    private void Entities_Basics()
+    {
+        global::Entities_Basics.Main();
+    }
+
+    [Fact]
+    private void Entities_Hierarchy()
+    {
+        global::Entities_Hierarchy.Main();
+    }
+
+    [Fact]
+    private void Entities_Hooks()
+    {
+        global::Entities_Hooks.Main();
+    }
+
+    [Fact]
+    private void Entities_IterateComponents()
+    {
+        global::Entities_IterateComponents.Main();
+    }
+
+    [Fact]
+    private void Entities_MultiSetGet()
+    {
+        global::Entities_MultiSetGet.Main();
+    }
+
+    [Fact]
+    private void Entities_Prefab()
+    {
+        global::Entities_Prefab.Main();
+    }
+
+    [Fact]
+    private void Entities_SettingComponents()
+    {
+        global::Entities_SettingComponents.Main();
+    }
+
+    [Fact]
+    private void GameMechanics_InventorySystem()
+    {
+        global::GameMechanics_InventorySystem.Main();
+    }
+
+    [Fact]
+    private void GameMechanics_SceneManagement()
+    {
+        global::GameMechanics_SceneManagement.Main();
+    }
+
+    [Fact]
+    private void Observers_Basics()
+    {
+        global::Observers_Basics.Main();
+    }
+
+    [Fact]
+    private void Observers_CustomEvent()
+    {
+        global::Observers_CustomEvent.Main();
+    }
+
+    [Fact]
+    private void Observers_EnqueueEntityEvent()
+    {
+        global::Observers_EnqueueEntityEvent.Main();
+    }
+
+    [Fact]
+    private void Observers_EnqueueEvent()
+    {
+        global::Observers_EnqueueEvent.Main();
+    }
+
+    [Fact]
+    private void Observers_EntityEvent()
+    {
+        global::Observers_EntityEvent.Main();
+    }
+
+    [Fact]
+    private void Observers_Monitor()
+    {
+        global::Observers_Monitor.Main();
+    }
+
+    [Fact]
+    private void Observers_Propagate()
+    {
+        global::Observers_Propagate.Main();
+    }
+
+    [Fact]
+    private void Observers_TwoComponents()
+    {
+        global::Observers_TwoComponents.Main();
+    }
+
+    [Fact]
+    private void Observers_YieldExisting()
+    {
+        global::Observers_YieldExisting.Main();
+    }
+
+    [Fact]
+    private void Prefabs_Basics()
+    {
+        global::Prefabs_Basics.Main();
+    }
+
+    [Fact]
+    private void Prefabs_Hierarchy()
+    {
+        global::Prefabs_Hierarchy.Main();
+    }
+
+    [Fact]
+    private void Prefabs_NestedPrefabs()
+    {
+        global::Prefabs_NestedPrefabs.Main();
+    }
+
+    [Fact]
+    private void Prefabs_Override()
+    {
+        global::Prefabs_Override.Main();
+    }
+
+    [Fact]
+    private void Prefabs_Slots()
+    {
+        global::Prefabs_Slots.Main();
+    }
+
+    [Fact]
+    private void Prefabs_TypedPrefabs()
+    {
+        global::Prefabs_TypedPrefabs.Main();
+    }
+
+    [Fact]
+    private void Prefabs_Variant()
+    {
+        global::Prefabs_Variant.Main();
+    }
+
+    [Fact]
+    private void Queries_BasicIteration()
+    {
+        global::Queries_BasicIteration.Main();
+    }
+
+    [Fact]
+    private void Queries_Basics()
+    {
+        global::Queries_Basics.Main();
+    }
+
+    [Fact]
+    private void Queries_ChangeTracking()
+    {
+        global::Queries_ChangeTracking.Main();
+    }
+
+    [Fact]
+    private void Queries_ComponentInheritance()
+    {
+        global::Queries_ComponentInheritance.Main();
+    }
+
+    [Fact]
+    private void Queries_CyclicVariables()
+    {
+        global::Queries_CyclicVariables.Main();
+    }
+
+    [Fact]
+    private void Queries_Facts()
+    {
+        global::Queries_Facts.Main();
+    }
+
+    [Fact]
+    private void Queries_FindEntity()
+    {
+        global::Queries_FindEntity.Main();
+    }
+
+    [Fact]
+    private void Queries_GroupBy()
+    {
+        global::Queries_GroupBy.Main();
+    }
+
+    [Fact]
+    private void Queries_GroupByCallbacks()
+    {
+        global::Queries_GroupByCallbacks.Main();
+    }
+
+    [Fact]
+    private void Queries_GroupByCustom()
+    {
+        global::Queries_GroupByCustom.Main();
+    }
+
+    [Fact]
+    private void Queries_GroupIter()
+    {
+        global::Queries_GroupIter.Main();
+    }
+
+    [Fact]
+    private void Queries_Hierarchy()
+    {
+        global::Queries_Hierarchy.Main();
+    }
+
+    [Fact]
+    private void Queries_Iter()
+    {
+        global::Queries_Iter.Main();
+    }
+
+    [Fact]
+    private void Queries_IterTargets()
+    {
+        global::Queries_IterTargets.Main();
+    }
+
+    [Fact]
+    private void Queries_SettingVariables()
+    {
+        global::Queries_SettingVariables.Main();
+    }
+
+    [Fact]
+    private void Queries_Singleton()
+    {
+        global::Queries_Singleton.Main();
+    }
+
+    [Fact]
+    private void Queries_Sorting()
+    {
+        global::Queries_Sorting.Main();
+    }
+
+    [Fact]
+    private void Queries_TransitiveQueries()
+    {
+        global::Queries_TransitiveQueries.Main();
+    }
+
+    [Fact]
+    private void Queries_Variables()
+    {
+        global::Queries_Variables.Main();
+    }
+
+    [Fact]
+    private void Queries_Wildcards()
+    {
+        global::Queries_Wildcards.Main();
+    }
+
+    [Fact]
+    private void Queries_With()
+    {
+        global::Queries_With.Main();
+    }
+
+    [Fact]
+    private void Queries_Without()
+    {
+        global::Queries_Without.Main();
+    }
+
+    [Fact]
+    private void Queries_WorldQuery()
+    {
+        global::Queries_WorldQuery.Main();
+    }
+
+    [Fact]
+    private void Reflection_Basics()
+    {
+        global::Reflection_Basics.Main();
+    }
+
+    [Fact]
+    private void Reflection_BasicsBitmask()
+    {
+        global::Reflection_BasicsBitmask.Main();
+    }
+
+    [Fact]
+    private void Reflection_BasicsDeserialize()
+    {
+        global::Reflection_BasicsDeserialize.Main();
+    }
+
+    [Fact]
+    private void Reflection_BasicsEnum()
+    {
+        global::Reflection_BasicsEnum.Main();
+    }
+
+    [Fact]
+    private void Reflection_BasicsJson()
+    {
+        global::Reflection_BasicsJson.Main();
+    }
+
+    [Fact]
+    private void Reflection_EntityType()
+    {
+        global::Reflection_EntityType.Main();
+    }
+
+    [Fact]
+    private void Reflection_MemberRanges()
+    {
+        global::Reflection_MemberRanges.Main();
+    }
+
+    [Fact]
+    private void Reflection_NestedSetMember()
+    {
+        global::Reflection_NestedSetMember.Main();
+    }
+
+    [Fact]
+    private void Reflection_NestedStruct()
+    {
+        global::Reflection_NestedStruct.Main();
+    }
+
+    [Fact]
+    private void Reflection_QueryToCustomJson()
+    {
+        global::Reflection_QueryToCustomJson.Main();
+    }
+
+    [Fact]
+    private void Reflection_QueryToJson()
+    {
+        global::Reflection_QueryToJson.Main();
+    }
+
+    [Fact]
+    private void Reflection_RuntimeComponent()
+    {
+        global::Reflection_RuntimeComponent.Main();
+    }
+
+    [Fact]
+    private void Reflection_RuntimeNestedComponent()
+    {
+        global::Reflection_RuntimeNestedComponent.Main();
+    }
+
+    [Fact]
+    private void Reflection_Units()
+    {
+        global::Reflection_Units.Main();
+    }
+
+    [Fact]
+    private void Reflection_WorldSerializeDeserialize()
+    {
+        global::Reflection_WorldSerializeDeserialize.Main();
+    }
+
+    [Fact]
+    private void Relationships_Basics()
+    {
+        global::Relationships_Basics.Main();
+    }
+
+    [Fact]
+    private void Relationships_EnumRelations()
+    {
+        global::Relationships_EnumRelations.Main();
+    }
+
+    [Fact]
+    private void Relationships_ExclusiveRelations()
+    {
+        global::Relationships_ExclusiveRelations.Main();
+    }
+
+    [Fact]
+    private void Relationships_RelationComponent()
+    {
+        global::Relationships_RelationComponent.Main();
+    }
+
+    [Fact]
+    private void Relationships_SymmetricRelations()
+    {
+        global::Relationships_SymmetricRelations.Main();
+    }
+
+    [Fact]
+    private void Systems_Basics()
+    {
+        global::Systems_Basics.Main();
+    }
+
+    [Fact]
+    private void Systems_CustomPhases()
+    {
+        global::Systems_CustomPhases.Main();
+    }
+
+    [Fact]
+    private void Systems_CustomPhasesNoBuiltIn()
+    {
+        global::Systems_CustomPhasesNoBuiltIn.Main();
+    }
+
+    [Fact]
+    private void Systems_CustomPipeline()
+    {
+        global::Systems_CustomPipeline.Main();
+    }
+
+    [Fact]
+    private void Systems_CustomRunner()
+    {
+        global::Systems_CustomRunner.Main();
+    }
+
+    [Fact]
+    private void Systems_DeltaTime()
+    {
+        global::Systems_DeltaTime.Main();
+    }
+
+    [Fact]
+    private void Systems_Immediate()
+    {
+        global::Systems_Immediate.Main();
+    }
+
+    [Fact]
+    private void Systems_MutateEntity()
+    {
+        global::Systems_MutateEntity.Main();
+    }
+
+    [Fact]
+    private void Systems_MutateEntityHandle()
+    {
+        global::Systems_MutateEntityHandle.Main();
+    }
+
+    [Fact]
+    private void Systems_Pipeline()
+    {
+        global::Systems_Pipeline.Main();
+    }
+
+    [Fact]
+    private void Systems_RunWithCallback()
+    {
+        global::Systems_RunWithCallback.Main();
+    }
+
+    [Fact]
+    private void Systems_StartupSystem()
+    {
+        global::Systems_StartupSystem.Main();
+    }
+
+    [Fact]
+    private void Systems_SyncPoint()
+    {
+        global::Systems_SyncPoint.Main();
+    }
+
+    [Fact]
+    private void Systems_SyncPointDelete()
+    {
+        global::Systems_SyncPointDelete.Main();
+    }
+
+    [Fact]
+    private void Systems_SystemCtx()
+    {
+        global::Systems_SystemCtx.Main();
+    }
+
+    [Fact]
+    private void Systems_TargetFps()
+    {
+        global::Systems_TargetFps.Main();
+    }
+
+    [Fact]
+    private void Systems_TimeInterval()
+    {
+        global::Systems_TimeInterval.Main();
+    }
+}
diff --git a/src/Flecs.NET.Tests/Cpp/EntityTests.cs b/src/Flecs.NET.Tests/Cpp/EntityTests.cs
index 0d799403..b752095c 100644
--- a/src/Flecs.NET.Tests/Cpp/EntityTests.cs
+++ b/src/Flecs.NET.Tests/Cpp/EntityTests.cs
@@ -1,4757 +1,4757 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using Flecs.NET.Core;
-using Xunit;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Tests.Cpp;
-
-[SuppressMessage("ReSharper", "UnusedParameter.Local")]
-[SuppressMessage("ReSharper", "ParameterOnlyUsedForPreconditionCheck.Local")]
-[SuppressMessage("ReSharper", "AccessToDisposedClosure")]
-public unsafe class EntityTests
-{
-    [Fact]
-    public void New()
-    {
-        using World world = World.Create();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-    }
-
-    [Fact]
-    public void NewNamed()
-    {
-        using World world = World.Create();
-
-        Entity entity = new Entity(world, "Foo");
-        Assert.True(entity != 0);
-        Assert.Equal("Foo", entity.Name());
-    }
-
-    [Fact]
-    public void NewNamedFromScope()
-    {
-        using World world = World.Create();
-
-        Entity entity = new Entity(world, "Foo");
-        Assert.True(entity != 0);
-        Assert.Equal("Foo", entity.Name());
-
-        Entity prev = world.SetScope(entity);
-
-        Entity child = world.Entity("Bar");
-        Assert.True(child != 0);
-
-        world.SetScope(prev);
-
-        Assert.Equal("Bar", child.Name());
-        Assert.Equal(".Foo.Bar", child.Path());
-    }
-
-    [Fact]
-    private void NewNestedNamedFromFromScope()
-    {
-        using World world = World.Create();
-
-        Entity entity = new Entity(world, "Foo");
-        Assert.True(entity != 0);
-        Assert.Equal("Foo", entity.Name());
-
-        Entity prev = world.SetScope(entity);
-
-        Entity child = world.Entity("Bar.Hello");
-        Assert.True(child != 0);
-
-        world.SetScope(prev);
-
-        Assert.Equal("Hello", child.Name());
-        Assert.Equal(".Foo.Bar.Hello", child.Path());
-    }
-
-    [Fact]
-    private void NewNestedNamedFromNestedScope()
-    {
-        using World world = World.Create();
-
-        Entity entity = new Entity(world, "Foo.Bar");
-        Assert.True(entity != 0);
-        Assert.Equal("Bar", entity.Name());
-        Assert.Equal(".Foo.Bar", entity.Path());
-
-        Entity prev = world.SetScope(entity);
-
-        Entity child = world.Entity("Hello.World");
-        Assert.True(child != 0);
-
-        world.SetScope(prev);
-
-        Assert.Equal("World", child.Name());
-        Assert.Equal(".Foo.Bar.Hello.World", child.Path());
-    }
-
-    [Fact]
-    private void NewAdd()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-
-        Entity entity = world.Entity()
-            .Add<Position>();
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-    }
-
-    [Fact]
-    private void NewAdd2()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Add<Position>()
-            .Add<Velocity>();
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-        Assert.True(entity.Has<Velocity>());
-    }
-
-    [Fact]
-    private void NewSet()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void NewSet2()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-        Assert.True(entity.Has<Velocity>());
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Velocity* v = entity.GetPtr<Velocity>();
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-    }
-
-    [Fact]
-    private void Add()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add<Position>();
-        Assert.True(entity.Has<Position>());
-    }
-
-    [Fact]
-    private void Remove()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add<Position>();
-        Assert.True(entity.Has<Position>());
-
-        entity.Remove<Position>();
-        Assert.True(!entity.Has<Position>());
-    }
-
-    [Fact]
-    private void Set()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Set(new Position(10, 20));
-        Assert.True(entity.Has<Position>());
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void Add2()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add<Position>()
-            .Add<Velocity>();
-
-        Assert.True(entity.Has<Position>());
-        Assert.True(entity.Has<Velocity>());
-    }
-
-    [Fact]
-    private void AddEntity()
-    {
-        using World world = World.Create();
-
-        Entity tag = world.Entity();
-        Assert.True(tag != 0);
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add(tag);
-        Assert.True(entity.Has(tag));
-    }
-
-    [Fact]
-    private void AddChildOf()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity();
-        Assert.True(parent != 0);
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add(EcsChildOf, parent);
-        Assert.True(entity.Has(EcsChildOf, parent));
-    }
-
-    [Fact]
-    private void AddInstanceOf()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity();
-        Assert.True(@base != 0);
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add(EcsIsA, @base);
-        Assert.True(entity.Has(EcsIsA, @base));
-    }
-
-    [Fact]
-    private void Remove2()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add<Position>()
-            .Add<Velocity>();
-
-        Assert.True(entity.Has<Position>());
-        Assert.True(entity.Has<Velocity>());
-
-        entity.Remove<Position>()
-            .Remove<Velocity>();
-
-        Assert.True(!entity.Has<Position>());
-        Assert.True(!entity.Has<Velocity>());
-    }
-
-    [Fact]
-    private void Set2()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-        Assert.True(entity.Has<Position>());
-        Assert.True(entity.Has<Velocity>());
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Velocity* v = entity.GetPtr<Velocity>();
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-    }
-
-    [Fact]
-    private void RemoveEntity()
-    {
-        using World world = World.Create();
-
-        Entity tag = world.Entity();
-        Assert.True(tag != 0);
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add(tag);
-        Assert.True(entity.Has(tag));
-
-        entity.Remove(tag);
-        Assert.True(!entity.Has(tag));
-    }
-
-    [Fact]
-    private void RemoveChildOf()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity();
-        Assert.True(parent != 0);
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add(EcsChildOf, parent);
-        Assert.True(entity.Has(EcsChildOf, parent));
-
-        entity.Remove(EcsChildOf, parent);
-        Assert.True(!entity.Has(EcsChildOf, parent));
-    }
-
-    [Fact]
-    private void RemoveInstanceOf()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity();
-        Assert.True(@base != 0);
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        entity.Add(EcsIsA, @base);
-        Assert.True(entity.Has(EcsIsA, @base));
-
-        entity.Remove(EcsIsA, @base);
-        Assert.True(!entity.Has(EcsIsA, @base));
-    }
-
-    [Fact]
-    private void GetGeneric()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-
-        void* voidPointer = entity.GetPtr(position);
-        Assert.True(voidPointer != null);
-
-        Position* p = (Position*)voidPointer;
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-
-    [Fact]
-    private void EnsureGeneric()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-
-        bool invoked = false;
-
-        world.Observer<Position>()
-            .Event(Ecs.OnSet)
-            .Each((Entity e, ref Position p) => { invoked = true; });
-
-        void* voidPointer = entity.EnsurePtr(position);
-        Assert.True(voidPointer != null);
-
-        Position* p = (Position*)voidPointer;
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        entity.Modified(position);
-        Assert.True(invoked);
-    }
-
-    [Fact]
-    private void GetGenericWithId()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        Id id = position;
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-
-        void* voidPointer = entity.GetPtr(id);
-        Assert.True(voidPointer != null);
-
-        Position* p = (Position*)voidPointer;
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void GetGenericWithUlong()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        ulong id = position;
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-
-        void* voidPointer = entity.GetPtr(id);
-        Assert.True(voidPointer != null);
-
-        Position* p = (Position*)voidPointer;
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-
-    [Fact]
-    private void EnsureGenericWithId()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        Id id = position;
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-
-        bool invoked = false;
-
-        world.Observer<Position>()
-            .Event(Ecs.OnSet)
-            .Each((Entity e, ref Position p) => { invoked = true; });
-
-        void* voidPointer = entity.GetPtr(id);
-        Assert.True(voidPointer != null);
-
-        Position* p = (Position*)voidPointer;
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        entity.Modified(id);
-        Assert.True(invoked);
-    }
-
-    [Fact]
-    private void EnsureGenericWithUlong()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        ulong id = position;
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(entity != 0);
-        Assert.True(entity.Has<Position>());
-
-        bool invoked = false;
-
-        world.Observer<Position>()
-            .Event(Ecs.OnSet)
-            .Each((Entity e, ref Position p) => { invoked = true; });
-
-        void* voidPointer = entity.EnsurePtr(id);
-        Assert.True(voidPointer != null);
-
-        Position* p = (Position*)voidPointer;
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        entity.Modified(id);
-        Assert.True(invoked);
-    }
-
-    [Fact]
-    private void GetMutWithId()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        Position* p = (Position*)e.GetMutPtr(world.Id<Position>());
-        Assert.True(p == null);
-
-        e.Set(new Position(10, 20));
-
-        p = (Position*)e.GetMutPtr(world.Id<Position>());
-        Assert.True(p != null);
-
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void GetMutT()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        Position* p = e.GetMutPtr<Position>();
-        Assert.True(p == null);
-
-        e.Set(new Position(10, 20));
-
-        p = e.GetMutPtr<Position>();
-        Assert.True(p != null);
-
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void GetMutrt()
-    {
-        using World world = World.Create();
-
-        Entity tgt = world.Entity();
-        Entity e = world.Entity();
-
-        Position* p = (Position*)e.GetMutPtr(world.Id<Position>(), tgt);
-        Assert.True(p == null);
-
-        e.Set(tgt, new Position(10, 20));
-
-        p = (Position*)e.GetMutPtr(world.Id<Position>(), tgt);
-        Assert.True(p != null);
-
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void GetMutRt()
-    {
-        using World world = World.Create();
-
-        Entity tgt = world.Entity();
-        Entity e = world.Entity();
-
-        Position* p = e.GetMutPtr<Position>(tgt);
-        Assert.True(p == null);
-
-        e.Set(tgt, new Position(10, 20));
-
-        p = e.GetMutPtr<Position>(tgt);
-        Assert.True(p != null);
-
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void GetMutRT()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        Position* p = e.GetMutFirstPtr<Position, Tgt>();
-        Assert.True(p == null);
-
-        e.Set<Position, Tgt>(new Position(10, 20));
-
-        p = e.GetMutFirstPtr<Position, Tgt>();
-        Assert.True(p != null);
-
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void GetMutrT()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Entity e = world.Entity();
-
-        Position* p = e.GetMutSecondPtr<Position>(rel);
-        Assert.True(p == null);
-
-        e.SetSecond(rel, new Position(10, 20));
-
-        p = e.GetMutSecondPtr<Position>(rel);
-        Assert.True(p != null);
-
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void SetGeneric()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-
-        Position p = new Position(10, 20);
-
-        Entity e = world.Entity()
-            .SetUntyped(position, sizeof(Position), &p);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has(position));
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void SetGenericWithId()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        Id id = position;
-
-        Position p = new Position(10, 20);
-
-        Entity e = world.Entity()
-            .SetUntyped(id, sizeof(Position), &p);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has(id));
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void SetGenericWithUlong()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        ulong id = position;
-
-        Position p = new Position(10, 20);
-
-        Entity e = world.Entity()
-            .SetUntyped(id, sizeof(Position), &p);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has(id));
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void SetGenericNoSize()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-
-        Position p = new Position(10, 20);
-
-        Entity e = world.Entity()
-            .SetUntyped(position, &p);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has(position));
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void SetGenericNoSizeWithId()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        Id id = position;
-
-        Position p = new Position(10, 20);
-
-        Entity e = world.Entity()
-            .SetUntyped(id, &p);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has(id));
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void SetGenericNoSizeWithUlong()
-    {
-        using World world = World.Create();
-
-        Component<Position> position = world.Component<Position>();
-        ulong id = position;
-
-        Position p = new Position(10, 20);
-
-        Entity e = world.Entity()
-            .SetUntyped(id, &p);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has(id));
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void AddRole()
-    {
-        using World world = World.Create();
-
-        Entity entity = world.Entity();
-
-        entity = entity.AddFlags(ECS_PAIR);
-
-        Assert.True((entity & ECS_PAIR) != 0);
-    }
-
-    [Fact]
-    private void RemoveRole()
-    {
-        using World world = World.Create();
-
-        Entity entity = world.Entity();
-
-        ulong id = entity;
-
-        entity = entity.AddFlags(ECS_PAIR);
-
-        Assert.True((entity & ECS_PAIR) != 0);
-
-        entity = entity.RemoveFlags();
-
-        Assert.True(entity == id);
-    }
-
-    [Fact]
-    private void HasRole()
-    {
-        using World world = World.Create();
-
-        Entity entity = world.Entity();
-
-        entity = entity.AddFlags(ECS_PAIR);
-
-        Assert.True(entity.HasFlags(ECS_PAIR));
-
-        entity = entity.RemoveFlags();
-
-        Assert.True(!entity.HasFlags(ECS_PAIR));
-    }
-
-    [Fact]
-    private void PairRole()
-    {
-        using World world = World.Create();
-
-        Entity a = world.Entity();
-        Entity b = world.Entity();
-
-        Id pair = new Id(a, b);
-        pair = pair.AddFlags(ECS_PAIR);
-
-        Assert.True(pair.HasFlags(ECS_PAIR));
-
-        Entity rel = pair.First();
-        Entity obj = pair.Second();
-
-        Assert.True(rel == a);
-        Assert.True(obj == b);
-    }
-
-    [Fact]
-    private void EqualsTrue()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity();
-
-        Entity e12 = world.Entity(e1);
-        Entity e22 = world.Entity(e2);
-
-        Assert.True(e1 == e12);
-        Assert.True(e2 == e22);
-        Assert.True(e1 >= e12);
-        Assert.True(e1 <= e12);
-        Assert.True(e2 >= e22);
-        Assert.True(e2 <= e22);
-        Assert.True(e1 != e2);
-
-        Assert.True(!(e2 == e12));
-        Assert.True(!(e1 == e22));
-        Assert.True(!(e2 <= e12));
-        Assert.True(!(e1 >= e22));
-    }
-
-    [Fact]
-    private void Compare0()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity e0 = world.Entity(0);
-        Entity e02 = world.Entity(0);
-
-        Assert.True(e != e0);
-        Assert.True(e > e0);
-        Assert.True(e >= e0);
-        Assert.True(e0 < e);
-        Assert.True(e0 <= e);
-
-        Assert.True(e0 == e02);
-        Assert.True(e0 >= e02);
-        Assert.True(e0 <= e02);
-    }
-
-    [Fact]
-    private void CompareUlong()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity();
-
-        ulong id1 = e1;
-        ulong id2 = e2;
-
-        Assert.True(e1 == id1);
-        Assert.True(e2 == id2);
-
-        Assert.True(e1 != id2);
-        Assert.True(e2 != id1);
-
-        Assert.True(e1 >= id1);
-        Assert.True(e2 >= id2);
-
-        Assert.True(e1 <= id1);
-        Assert.True(e2 <= id2);
-
-        Assert.True(e1 <= id2);
-        Assert.True(e2 >= id1);
-
-        Assert.True(e1 < id2);
-        Assert.True(e2 > id1);
-
-
-        Assert.True(e2 != id1);
-        Assert.True(e1 != id2);
-
-        Assert.True(e2 == id2);
-        Assert.True(e1 == id1);
-
-        Assert.True(!(e1 >= id2));
-        Assert.True(!(e2 <= id1));
-
-        Assert.True(!(e2 < id2));
-        Assert.True(!(e1 > id1));
-    }
-
-    [Fact]
-    private void CompareId()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity();
-
-        Id id1 = e1;
-        Id id2 = e2;
-
-        Assert.True(e1 == id1);
-        Assert.True(e2 == id2);
-
-        Assert.True(e1 != id2);
-        Assert.True(e2 != id1);
-
-        Assert.True(e1 >= id1);
-        Assert.True(e2 >= id2);
-
-        Assert.True(e1 <= id1);
-        Assert.True(e2 <= id2);
-
-        Assert.True(e1 <= id2);
-        Assert.True(e2 >= id1);
-
-        Assert.True(e1 < id2);
-        Assert.True(e2 > id1);
-
-
-        Assert.True(e2 != id1);
-        Assert.True(e1 != id2);
-
-        Assert.True(e2 == id2);
-        Assert.True(e1 == id1);
-
-        Assert.True(!(e1 >= id2));
-        Assert.True(!(e2 <= id1));
-
-        Assert.True(!(e2 < id2));
-        Assert.True(!(e1 > id1));
-    }
-
-    [Fact]
-    private void CompareLiteral()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity(500);
-        Entity e2 = world.Entity(600);
-
-        Assert.True(e1 == 500);
-        Assert.True(e2 == 600);
-
-        Assert.True(e1 != 600);
-        Assert.True(e2 != 500);
-
-        Assert.True(e1 >= 500);
-        Assert.True(e2 >= 600);
-
-        Assert.True(e1 <= 500);
-        Assert.True(e2 <= 600);
-
-        Assert.True(e1 <= 600);
-        Assert.True(e2 >= 500);
-
-        Assert.True(e1 < 600);
-        Assert.True(e2 > 500);
-
-
-        Assert.True(e2 != 500);
-        Assert.True(e1 != 600);
-
-        Assert.True(e2 == 600);
-        Assert.True(e1 == 500);
-
-        Assert.True(!(e1 >= 600));
-        Assert.True(!(e2 <= 500));
-
-        Assert.True(!(e2 < 600));
-        Assert.True(!(e1 > 500));
-    }
-
-    [Fact]
-    private void GreaterThan()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity();
-
-        Assert.True(e2 > e1);
-        Assert.True(e2 >= e1);
-    }
-
-    [Fact]
-    private void LessThan()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity();
-
-        Assert.True(e1 < e2);
-        Assert.True(e1 <= e2);
-    }
-
-    [Fact]
-    private void Not0Or1()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        ulong id = e;
-
-        Assert.True(id != 0);
-        Assert.True(id != 1);
-    }
-
-    [Fact]
-    private void HasChildOf()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity();
-
-        Entity e = world.Entity()
-            .Add(EcsChildOf, parent);
-
-        Assert.True(e.Has(EcsChildOf, parent));
-    }
-
-    [Fact]
-    private void HasInstanceOf()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity();
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has(EcsIsA, @base));
-    }
-
-    [Fact]
-    private void HasInstanceOfIndirect()
-    {
-        using World world = World.Create();
-
-        Entity baseOfBase = world.Entity();
-
-        Entity @base = world.Entity()
-            .Add(EcsIsA, baseOfBase);
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has(EcsIsA, baseOfBase));
-    }
-
-    [Fact]
-    private void NullString()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        Assert.Equal("", e.Name());
-    }
-
-    [Fact]
-    private void SetName()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Assert.Equal("", e.Name());
-
-        e.SetName("Foo");
-        Assert.Equal("Foo", e.Name());
-    }
-
-    [Fact]
-    private void ChangeName()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity("Bar");
-        Assert.Equal("Bar", e.Name());
-
-        e.SetName("Foo");
-        Assert.Equal("Foo", e.Name());
-    }
-
-    [Fact]
-    private void Delete()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Add<Position>()
-            .Add<Velocity>();
-
-        e.Destruct();
-
-        Assert.True(!e.IsAlive());
-
-        Entity e2 = world.Entity();
-        Assert.True((uint)e2 == (uint)e);
-        Assert.True(e2 != e);
-    }
-
-    [Fact]
-    private void Clear()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Add<Position>()
-            .Add<Velocity>();
-
-        e.Clear();
-
-        Assert.True(!e.Has<Position>());
-        Assert.True(!e.Has<Velocity>());
-
-        Entity e2 = world.Entity();
-        Assert.True(e2 > e);
-    }
-
-    [Fact]
-    private void ForceOwned()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity prefab = world.Prefab()
-            .Add<Position>()
-            .Add<Velocity>()
-            .AutoOverride<Position>();
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, prefab);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Owns<Position>());
-        Assert.True(e.Has<Velocity>());
-        Assert.True(!e.Owns<Velocity>());
-    }
-
-    [Fact]
-    private void ForceOwned2()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity prefab = world.Prefab()
-            .Add<Position>()
-            .Add<Velocity>()
-            .AutoOverride<Position>()
-            .AutoOverride<Velocity>();
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, prefab);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Owns<Position>());
-        Assert.True(e.Has<Velocity>());
-        Assert.True(e.Owns<Velocity>());
-    }
-
-    [Fact]
-    private void ForceOwnedNested()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity prefab = world.Prefab()
-            .Add<Position>()
-            .Add<Velocity>()
-            .AutoOverride<Position>();
-
-        Entity prefab2 = world.Prefab()
-            .Add(EcsIsA, prefab);
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, prefab2);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Owns<Position>());
-        Assert.True(e.Has<Velocity>());
-        Assert.True(!e.Owns<Velocity>());
-    }
-
-    [Fact]
-    private void TagHasSizeZero()
-    {
-        using World world = World.Create();
-
-        Component<MyTag> comp = world.Component<MyTag>();
-
-        EcsComponent* ptr = comp.GetPtr<EcsComponent>();
-        Assert.Equal(0, ptr->size);
-        Assert.Equal(0, ptr->alignment);
-    }
-
-
-    [Fact]
-    private void GetTarget()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-
-        Entity obj1 = world.Entity()
-            .Add<Position>();
-
-        Entity obj2 = world.Entity()
-            .Add<Velocity>();
-
-        Entity obj3 = world.Entity()
-            .Add<Mass>();
-
-        Entity child = world.Entity()
-            .Add(rel, obj1)
-            .Add(rel, obj2)
-            .Add(rel, obj3);
-
-        Entity p = child.Target(rel);
-        Assert.True(p != 0);
-        Assert.True(p == obj1);
-
-        p = child.Target(rel);
-        Assert.True(p != 0);
-        Assert.True(p == obj1);
-
-        p = child.Target(rel, 1);
-        Assert.True(p != 0);
-        Assert.True(p == obj2);
-
-        p = child.Target(rel, 2);
-        Assert.True(p != 0);
-        Assert.True(p == obj3);
-
-        p = child.Target(rel, 3);
-        Assert.True(p == 0);
-    }
-
-    [Fact]
-    private void GetParent()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity();
-        Entity child = world.Entity().ChildOf(parent);
-
-        Assert.True(child.Target(EcsChildOf) == parent);
-        Assert.True(child.Parent() == parent);
-    }
-
-    [Fact]
-    private void IsComponentEnabled()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity e = world.Entity()
-            .Add<Position>();
-
-        Assert.True(e.Enabled<Position>());
-        Assert.True(!e.Enabled<Velocity>());
-    }
-
-    [Fact]
-    private void IsEnabledComponentEnabled()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity e = world.Entity()
-            .Add<Position>()
-            .Enable<Position>();
-
-        Assert.True(e.Enabled<Position>());
-    }
-
-    [Fact]
-    private void IsDisabledComponentEnabled()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity e = world.Entity()
-            .Add<Position>()
-            .Disable<Position>();
-
-        Assert.True(!e.Enabled<Position>());
-    }
-
-    [Fact]
-    private void IsPairEnabled()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity e = world.Entity()
-            .Add<Position, TgtA>();
-
-        Assert.True(e.Enabled<Position, TgtA>());
-        Assert.True(!e.Enabled<Position, TgtB>());
-    }
-
-    [Fact]
-    private void IsEnabledPairEnabled()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity e = world.Entity()
-            .Add<Position, Tgt>()
-            .Enable<Position, Tgt>();
-
-        Assert.True(e.Enabled<Position, Tgt>());
-    }
-
-    [Fact]
-    private void IsDisabledPairEnabled()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity e = world.Entity()
-            .Add<Position, Tgt>()
-            .Disable<Position, Tgt>();
-
-        Assert.True(!e.Enabled<Position, Tgt>());
-    }
-
-    [Fact]
-    private void IsPairEnabledWithIds()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity rel = world.Entity();
-        Entity tgtA = world.Entity();
-        Entity tgtB = world.Entity();
-
-        Entity e = world.Entity()
-            .Add(rel, tgtA);
-
-        Assert.True(e.Enabled(rel, tgtA));
-        Assert.True(!e.Enabled(rel, tgtB));
-    }
-
-    [Fact]
-    private void IsEnabledPairEnabledWithIds()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity().Add(Ecs.CanToggle);
-        Entity tgt = world.Entity();
-
-        Entity e = world.Entity()
-            .Add(rel, tgt)
-            .Enable(rel, tgt);
-
-        Assert.True(e.Enabled(rel, tgt));
-    }
-
-    [Fact]
-    private void IsDisabledPairEnabledWithIds()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity().Add(Ecs.CanToggle);
-        Entity tgt = world.Entity();
-
-        Entity e = world.Entity()
-            .Add(rel, tgt)
-            .Disable(rel, tgt);
-
-        Assert.True(!e.Enabled(rel, tgt));
-    }
-
-    [Fact]
-    private void IsPairEnabledWithTargetId()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity tgtA = world.Entity();
-        Entity tgtB = world.Entity();
-
-        Entity e = world.Entity()
-            .Add<Position>(tgtA);
-
-        Assert.True(e.Enabled<Position>(tgtA));
-        Assert.True(!e.Enabled<Position>(tgtB));
-    }
-
-    [Fact]
-    private void IsEnabledPairEnabledWithTargetId()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity tgt = world.Entity();
-
-        Entity e = world.Entity()
-            .Add<Position>(tgt)
-            .Enable<Position>(tgt);
-
-        Assert.True(e.Enabled<Position>(tgt));
-    }
-
-    [Fact]
-    private void IsDisabledPairEnabledWithTargetId()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.CanToggle);
-
-        Entity tgt = world.Entity();
-
-        Entity e = world.Entity()
-            .Add<Position>(tgt)
-            .Disable<Position>(tgt);
-
-        Assert.True(!e.Enabled<Position>(tgt));
-    }
-
-    [Fact]
-    private void GetTypes()
-    {
-        using World world = World.Create();
-
-        Entity entity = world.Entity();
-        Assert.True(entity != 0);
-
-        FlecsType type1 = entity.Type();
-        Assert.Equal(0, type1.Count());
-
-        FlecsType type2 = entity.Type();
-        Assert.Equal(0, type2.Count());
-    }
-
-    [Fact]
-    private void GetNonEmptyType()
-    {
-        using World world = World.Create();
-
-        Entity entity = world.Entity()
-            .Add<Position>();
-        Assert.True(entity != 0);
-
-        FlecsType type1 = entity.Type();
-        Assert.Equal(1, type1.Count());
-        Assert.Equal(type1.Get(0), world.Id<Position>());
-
-        FlecsType type2 = entity.Type();
-        Assert.Equal(1, type2.Count());
-        Assert.Equal(type2.Get(0), world.Id<Position>());
-    }
-
-    [Fact]
-    private void SetDeduced()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Position(10, 20));
-
-        Assert.True(e.Has<Position>());
-
-        Position* p = e.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void Override()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .AutoOverride<Position>();
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Owns<Position>());
-    }
-
-    [Fact]
-    private void OverrideId()
-    {
-        using World world = World.Create();
-
-        Entity tagA = world.Entity().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        Entity tagB = world.Entity().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .AutoOverride(tagA)
-            .Add(tagB);
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has(tagA));
-        Assert.True(e.Owns(tagA));
-
-        Assert.True(e.Has(tagB));
-        Assert.True(!e.Owns(tagB));
-    }
-
-    [Fact]
-    private void OverridePairWithTargetId()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        Entity tgtA = world.Entity();
-        Entity tgtB = world.Entity();
-
-        Entity @base = world.Entity()
-            .AutoOverride<Position>(tgtA)
-            .Add<Position>(tgtB);
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Position>(tgtA));
-        Assert.True(e.Owns<Position>(tgtA));
-
-        Assert.True(e.Has<Position>(tgtB));
-        Assert.True(!e.Owns<Position>(tgtB));
-    }
-
-    [Fact]
-    private void OverridePairWithIds()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        Entity tgtA = world.Entity();
-        Entity tgtB = world.Entity();
-
-        Entity @base = world.Entity()
-            .AutoOverride(rel, tgtA)
-            .Add(rel, tgtB);
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has(rel, tgtA));
-        Assert.True(e.Owns(rel, tgtA));
-
-        Assert.True(e.Has(rel, tgtB));
-        Assert.True(!e.Owns(rel, tgtB));
-    }
-
-    [Fact]
-    private void OverridePair()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .AutoOverride<Position, Tag0>()
-            .Add<Position, Tag1>();
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Position, Tag0>());
-        Assert.True(e.Owns<Position, Tag0>());
-
-        Assert.True(e.Has<Position, Tag1>());
-        Assert.True(!e.Owns<Position, Tag1>());
-    }
-
-    [Fact]
-    private void SetOverride()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .SetAutoOverride(new Position(10, 20));
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Owns<Position>());
-
-        Position* p = e.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Position* pBase = @base.GetPtr<Position>();
-        Assert.True(p != pBase);
-        Assert.Equal(10, pBase->X);
-        Assert.Equal(20, pBase->Y);
-    }
-
-    [Fact]
-    private void SetOverrideLValue()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Position plvalue = new Position(10, 20);
-
-        Entity @base = world.Entity()
-            .SetAutoOverride(plvalue);
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Owns<Position>());
-
-        Position* p = e.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Position* pBase = @base.GetPtr<Position>();
-        Assert.True(p != pBase);
-        Assert.Equal(10, pBase->X);
-        Assert.Equal(20, pBase->Y);
-    }
-
-    [Fact]
-    private void SetOverridePair()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .SetAutoOverride<Position, Tgt>(new Position(10, 20));
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Position, Tgt>());
-        Assert.True(e.Owns<Position, Tgt>());
-
-        Position* p = e.GetFirstPtr<Position, Tgt>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Position* pBase = @base.GetFirstPtr<Position, Tgt>();
-        Assert.True(p != pBase);
-        Assert.Equal(10, pBase->X);
-        Assert.Equal(20, pBase->Y);
-    }
-
-    [Fact]
-    private void SetOverridePairWithTargetId()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity tgt = world.Entity();
-
-        Entity @base = world.Entity()
-            .SetAutoOverride(tgt, new Position(10, 20));
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Position>(tgt));
-        Assert.True(e.Owns<Position>(tgt));
-
-        Position* p = e.GetPtr<Position>(tgt);
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Position* pBase = @base.GetPtr<Position>(tgt);
-        Assert.True(p != pBase);
-        Assert.Equal(10, pBase->X);
-        Assert.Equal(20, pBase->Y);
-    }
-
-    [Fact]
-    private void SetOverridePairWithRelTag()
-    {
-        using World world = World.Create();
-
-        world.Component<Tgt>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .SetAutoOverride<Tgt, Position>(new Position(10, 20));
-
-        Entity e = world.Entity()
-            .Add(EcsIsA, @base);
-
-        Assert.True(e.Has<Tgt, Position>());
-        Assert.True(e.Owns<Tgt, Position>());
-
-        Position* p = e.GetSecondPtr<Tgt, Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Position* pBase = @base.GetSecondPtr<Tgt, Position>();
-        Assert.True(p != pBase);
-        Assert.Equal(10, pBase->X);
-        Assert.Equal(20, pBase->Y);
-    }
-
-    [Fact]
-    private void ImplicitNameToChar()
-    {
-        using World world = World.Create();
-
-        Entity entity = new Entity(world, "Foo");
-        Assert.True(entity != 0);
-        Assert.Equal("Foo", entity.Name());
-
-        Assert.Equal("Foo", entity.Name());
-    }
-
-    [Fact]
-    private void Path()
-    {
-        using World world = World.Create();
-        Entity parent = world.Entity("parent");
-
-        using ScopedWorld scope = world.Scope(parent);
-        Entity child = world.Entity("child");
-        Assert.Equal(".parent.child", child.Path());
-    }
-
-    [Fact]
-    private void PathFrom()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity("parent");
-
-        using ScopedWorld parentScope = world.Scope(parent);
-        Entity child = world.Entity("child");
-
-        using ScopedWorld childScope = world.Scope(child);
-        Entity grandchild = world.Entity("grandchild");
-
-        Assert.Equal(".parent.child.grandchild", grandchild.Path());
-        Assert.Equal("child.grandchild", grandchild.PathFrom(parent));
-    }
-
-    [Fact]
-    private void PathFromType()
-    {
-        using World world = World.Create();
-        Entity parent = world.Entity<Parent>();
-
-        using ScopedWorld parentScope = world.Scope(parent);
-        Entity child = world.Entity("child");
-
-        using ScopedWorld childScope = world.Scope(child);
-        Entity grandchild = world.Entity("grandchild");
-
-        Assert.Equal(".Parent.child.grandchild", grandchild.Path());
-        Assert.Equal("child.grandchild", grandchild.PathFrom<Parent>());
-    }
-
-    [Fact]
-    private void PathCustomSep()
-    {
-        using World world = World.Create();
-        Entity parent = world.Entity("parent");
-
-        using ScopedWorld parentScope = world.Scope(parent);
-        Entity child = world.Entity("child");
-
-        Assert.Equal("parent_child", child.Path("_", ""));
-    }
-
-    [Fact]
-    private void PathFromCustomSep()
-    {
-        using World world = World.Create();
-        Entity parent = world.Entity("parent");
-
-        using ScopedWorld parentScope = world.Scope(parent);
-        Entity child = world.Entity("child");
-
-        using ScopedWorld childScope = world.Scope(child);
-        Entity grandchild = world.Entity("grandchild");
-
-        Assert.Equal(".parent.child.grandchild", grandchild.Path());
-        Assert.Equal("child_grandchild", grandchild.PathFrom(parent, "_"));
-    }
-
-    [Fact]
-    private void PathFromTypeCustomSep()
-    {
-        using World world = World.Create();
-        Entity parent = world.Entity<Parent>();
-
-        using ScopedWorld parentScope = world.Scope(parent);
-        Entity child = world.Entity("child");
-
-        using ScopedWorld childScope = world.Scope(child);
-        Entity grandchild = world.Entity("grandchild");
-
-        Assert.Equal(".Parent.child.grandchild", grandchild.Path());
-        Assert.Equal("child_grandchild", grandchild.PathFrom<Parent>("_"));
-    }
-
-    [Fact]
-    private void ImplicitPathToChar()
-    {
-        using World world = World.Create();
-
-        Entity entity = new Entity(world, "Foo.Bar");
-        Assert.True(entity != 0);
-        Assert.Equal("Bar", entity.Name());
-
-        Assert.Equal(".Foo.Bar", entity.Path());
-    }
-
-    [Fact]
-    private void ImplicitTypeStringToChar()
-    {
-        using World world = World.Create();
-
-        Entity entity = new Entity(world, "Foo");
-        Assert.True(entity != 0);
-
-        Assert.Equal("(Identifier,Name)", entity.Type().Str());
-    }
-
-    [Fact]
-    private void SetTemplate()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Template<int> { X = 10, Y = 20 });
-
-        Template<int>* ptr = e.GetPtr<Template<int>>();
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void Get1ComponentWithCallback()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(11, 22));
-
-        Entity e3 = world.Entity()
-            .Set(new Velocity(1, 2));
-
-        Assert.True(e1.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-        }));
-
-        Assert.True(e2.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(11, p.X);
-            Assert.Equal(22, p.Y);
-        }));
-
-        Assert.False(e3.Read((ref readonly Position p) => { }));
-    }
-
-    [Fact]
-    private void Get2ComponentWithCallback()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(11, 22));
-
-        Entity e3 = world.Entity()
-            .Set(new Velocity(1, 2));
-
-        Assert.True(e1.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-        }));
-
-        Assert.False(e2.Read((ref readonly Position p, ref readonly Velocity v) => { }));
-
-        Assert.False(e3.Read((ref readonly Position p, ref readonly Velocity v) => { }));
-    }
-
-    [Fact]
-    private void Ensure1ComponentWithCallback()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(11, 22));
-
-        Entity e3 = world.Entity()
-            .Set(new Velocity(1, 2));
-
-        Assert.True(e1.Write((ref Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-            p.X++;
-            p.Y += 2;
-        }));
-
-        Assert.True(e2.Write((ref Position p) =>
-        {
-            Assert.Equal(11, p.X);
-            Assert.Equal(22, p.Y);
-            p.X++;
-            p.Y += 2;
-        }));
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        p = e2.GetPtr<Position>();
-        Assert.Equal(12, p->X);
-        Assert.Equal(24, p->Y);
-
-        Assert.False(e3.Read((ref readonly Position _) => { }));
-    }
-
-    [Fact]
-    private void Ensure2ComponentWithCallback()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(11, 22));
-
-        Entity e3 = world.Entity()
-            .Set(new Velocity(1, 2));
-
-        Assert.True(e1.Write((ref Position p, ref Velocity v) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-
-            p.X++;
-            p.Y += 2;
-            v.X += 3;
-            v.Y += 4;
-        }));
-
-        Assert.False(e2.Read((ref readonly Position p, ref readonly Velocity v) => { }));
-
-        Assert.False(e3.Read((ref readonly Position p, ref readonly Velocity v) => { }));
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        Velocity* v = e1.GetPtr<Velocity>();
-        Assert.Equal(4, v->X);
-        Assert.Equal(6, v->Y);
-    }
-
-    [Fact]
-    private void GetComponentWithCallbackNested()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Assert.True(e.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.True(e.Read((ref readonly Velocity v) =>
-            {
-                Assert.Equal(1, v.X);
-                Assert.Equal(2, v.Y);
-            }));
-        }));
-    }
-
-    [Fact]
-    private void Set1ComponentWithCallback()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p) =>
-            {
-                p.X = 10;
-                p.Y = 20;
-            });
-
-        Assert.True(e.Has<Position>());
-
-        Position* p = e.GetPtr<Position>();
-        Assert.True(p != null);
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void Set2ComponentsWithCallback()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p, ref Velocity v) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-            });
-
-        Assert.True(e.Has<Position>());
-
-        Position* p = e.GetPtr<Position>();
-        Assert.True(p != null);
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Velocity* v = e.GetPtr<Velocity>();
-        Assert.True(v != null);
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-    }
-
-    [Fact]
-    private void Set3ComponentsWithCallback()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p, ref Velocity v, ref Mass m) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-                m = new Mass(50);
-            });
-
-        Assert.True(e.Has<Position>());
-
-        Position* p = e.GetPtr<Position>();
-        Assert.True(p != null);
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Velocity* v = e.GetPtr<Velocity>();
-        Assert.True(v != null);
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-
-        Mass* m = e.GetPtr<Mass>();
-        Assert.True(m != null);
-        Assert.Equal(50, m->Value);
-    }
-
-    [Fact]
-    private void DeferSet1Component()
-    {
-        using World world = World.Create();
-
-        world.DeferBegin();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p) =>
-            {
-                p.X = 10;
-                p.Y = 20;
-            });
-
-        Assert.True(!e.Has<Position>());
-
-        world.DeferEnd();
-
-        Assert.True(e.Has<Position>());
-
-        e.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-        });
-    }
-
-    [Fact]
-    private void DeferSet2Components()
-    {
-        using World world = World.Create();
-
-        world.DeferBegin();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p, ref Velocity v) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-            });
-
-        Assert.True(!e.Has<Position>());
-        Assert.True(!e.Has<Velocity>());
-
-        world.DeferEnd();
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-
-        e.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-        });
-    }
-
-    [Fact]
-    private void DeferSet3Components()
-    {
-        using World world = World.Create();
-
-        world.DeferBegin();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p, ref Velocity v, ref Mass m) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-                m = new Mass(50);
-            });
-
-        Assert.True(!e.Has<Position>());
-        Assert.True(!e.Has<Velocity>());
-        Assert.True(!e.Has<Mass>());
-
-        world.DeferEnd();
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-        Assert.True(e.Has<Mass>());
-
-        e.Read((ref readonly Position p, ref readonly Velocity v, ref readonly Mass m) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-
-            Assert.Equal(50, m.Value);
-        });
-    }
-
-    [Fact]
-    private void Set2WithOnSet()
-    {
-        using World world = World.Create();
-
-        int positionSet = 0;
-        int velocitySet = 0;
-
-        world.Observer<Position>()
-            .Event(Ecs.OnSet)
-            .Each((Entity e, ref Position p) =>
-            {
-                positionSet++;
-                Assert.Equal(10, p.X);
-                Assert.Equal(20, p.Y);
-            });
-
-        world.Observer<Velocity>()
-            .Event(Ecs.OnSet)
-            .Each((Entity e, ref Velocity v) =>
-            {
-                velocitySet++;
-                Assert.Equal(1, v.X);
-                Assert.Equal(2, v.Y);
-            });
-
-        Entity e = world.Entity()
-            .Insert((ref Position p, ref Velocity v) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-            });
-
-        Assert.Equal(1, positionSet);
-        Assert.Equal(1, velocitySet);
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-        }));
-    }
-
-    [Fact]
-    private void DeferSet2WithOnSet()
-    {
-        using World world = World.Create();
-
-        int positionSet = 0;
-        int velocitySet = 0;
-
-        world.Observer<Position>()
-            .Event(Ecs.OnSet)
-            .Each((Entity e, ref Position p) =>
-            {
-                positionSet++;
-                Assert.Equal(10, p.X);
-                Assert.Equal(20, p.Y);
-            });
-
-        world.Observer<Velocity>()
-            .Event(Ecs.OnSet)
-            .Each((Entity e, ref Velocity v) =>
-            {
-                velocitySet++;
-                Assert.Equal(1, v.X);
-                Assert.Equal(2, v.Y);
-            });
-
-        world.DeferBegin();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p, ref Velocity v) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-            });
-
-        Assert.Equal(0, positionSet);
-        Assert.Equal(0, velocitySet);
-
-        world.DeferEnd();
-
-        Assert.Equal(1, positionSet);
-        Assert.Equal(1, velocitySet);
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-        }));
-    }
-
-    [Fact]
-    private void Set2AfterFluent()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Mass(50))
-            .Insert((ref Position p, ref Velocity v) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-            });
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-        Assert.True(e.Has<Mass>());
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v, ref readonly Mass m) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-
-            Assert.Equal(50, m.Value);
-        }));
-    }
-
-    [Fact]
-    private void Set2BeforeFluent()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Insert((ref Position p, ref Velocity v) =>
-            {
-                p = new Position(10, 20);
-                v = new Velocity(1, 2);
-            })
-            .Set(new Mass(50));
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-        Assert.True(e.Has<Mass>());
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v, ref readonly Mass m) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-
-            Assert.Equal(50, m.Value);
-        }));
-    }
-
-    [Fact]
-    private void Set2AfterSet1()
-    {
-        using World world = World.Create();
-
-        int called = 0;
-
-        Entity e = world.Entity().Set(new Position(5, 10));
-        Assert.True(e.Has<Position>());
-
-        Assert.True(e.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(5, p.X);
-            Assert.Equal(10, p.Y);
-        }));
-
-        e.Insert((ref Position p, ref Velocity v) =>
-        {
-            p = new Position(10, 20);
-            v = new Velocity(1, 2);
-        });
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-
-            called++;
-        }));
-
-        Assert.Equal(1, called);
-    }
-
-    [Fact]
-    private void Set2AfterSet2()
-    {
-        using World world = World.Create();
-
-        int called = 0;
-
-        Entity e = world.Entity()
-            .Set(new Position(5, 10))
-            .Set(new Velocity(1, 2));
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(5, p.X);
-            Assert.Equal(10, p.Y);
-
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-
-            called++;
-        }));
-
-        Assert.Equal(1, called);
-
-        e.Insert((ref Position p, ref Velocity v) =>
-        {
-            p = new Position(10, 20);
-            v = new Velocity(3, 4);
-        });
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(3, v.X);
-            Assert.Equal(4, v.Y);
-
-            called++;
-        }));
-
-        Assert.Equal(2, called);
-    }
-
-    [Fact]
-    private void WithSelf()
-    {
-        using World world = World.Create();
-
-        Entity tag = world.Entity().With(() =>
-        {
-            Entity e1 = world.Entity();
-            e1.Set(new Self { Value = e1 });
-            Entity e2 = world.Entity();
-            e2.Set(new Self { Value = e2 });
-            Entity e3 = world.Entity();
-            e3.Set(new Self { Value = e3 });
-        });
-
-        Component<Self> self = world.Component<Self>();
-        Assert.True(!self.Has(tag));
-
-        int count = 0;
-        using Query query = world.QueryBuilder()
-            .With(tag)
-            .Build();
-
-        query.Each((Entity e) =>
-        {
-            Assert.True(e.Has(tag));
-
-            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
-
-            count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void WithRelationTypeSelf()
-    {
-        using World world = World.Create();
-
-        Entity bob = world.Entity().With<Likes>(() =>
-        {
-            Entity e1 = world.Entity();
-            e1.Set(new Self(e1));
-            Entity e2 = world.Entity();
-            e2.Set(new Self(e2));
-            Entity e3 = world.Entity();
-            e3.Set(new Self(e3));
-        });
-
-        Component<Self> self = world.Component<Self>();
-        Assert.True(!self.Has<Likes>(bob));
-
-        int count = 0;
-        using Query q = world.QueryBuilder()
-            .With<Likes>(bob)
-            .Build();
-
-        q.Each((Entity e) =>
-        {
-            Assert.True(e.Has<Likes>(bob));
-
-            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
-
-            count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void WithRelationSelf()
-    {
-        using World world = World.Create();
-
-        Entity likes = world.Entity();
-
-        Entity bob = world.Entity().With(likes, () =>
-        {
-            Entity e1 = world.Entity();
-            e1.Set(new Self(e1));
-            Entity e2 = world.Entity();
-            e2.Set(new Self(e2));
-            Entity e3 = world.Entity();
-            e3.Set(new Self(e3));
-        });
-
-        Component<Self> self = world.Component<Self>();
-        Assert.True(!self.Has(likes, bob));
-
-        int count = 0;
-        using Query q = world.QueryBuilder()
-            .With(likes, bob)
-            .Build();
-
-        q.Each((Entity e) =>
-        {
-            Assert.True(e.Has(likes, bob));
-
-            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
-
-            count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void WithSelfWithName()
-    {
-        using World world = World.Create();
-
-        Entity tier1 = world.Entity("Tier1").With(() =>
-        {
-            Entity tier2 = world.Entity("Tier2");
-            tier2.Set(new Self(tier2));
-        });
-
-        Entity tier2 = world.Lookup("Tier2");
-        Assert.True(tier2 != 0);
-
-        Assert.True(tier2.Has(tier1));
-    }
-
-    [Fact]
-    private void WithSelfNested()
-    {
-        using World world = World.Create();
-
-        Entity tier1 = world.Entity("Tier1").With(() =>
-        {
-            world.Entity("Tier2").With(() => { world.Entity("Tier3"); });
-        });
-
-        Entity tier2 = world.Lookup("Tier2");
-        Assert.True(tier2 != 0);
-
-        Entity tier3 = world.Lookup("Tier3");
-        Assert.True(tier3 != 0);
-
-        Assert.True(tier2.Has(tier1));
-        Assert.True(tier3.Has(tier2));
-    }
-
-    [Fact]
-    private void WithScope()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity("P").Scope(() =>
-        {
-            Entity e1 = world.Entity("C1");
-            e1.Set(new Self(e1));
-            Entity e2 = world.Entity("C2");
-            e2.Set(new Self(e2));
-            Entity e3 = world.Entity("C3");
-            e3.Set(new Self(e3));
-
-            Assert.True(world.Lookup("C1") == e1);
-            Assert.True(world.Lookup("C2") == e2);
-            Assert.True(world.Lookup("C3") == e3);
-
-            Assert.True(world.Lookup(".P.C1") == e1);
-            Assert.True(world.Lookup(".P.C2") == e2);
-            Assert.True(world.Lookup(".P.C3") == e3);
-        });
-
-        Assert.True(world.Lookup("C1") == 0);
-        Assert.True(world.Lookup("C2") == 0);
-        Assert.True(world.Lookup("C3") == 0);
-
-        Assert.True(parent.Lookup("C1") != 0);
-        Assert.True(parent.Lookup("C2") != 0);
-        Assert.True(parent.Lookup("C3") != 0);
-
-        Assert.True(world.Lookup("P.C1") == parent.Lookup("C1"));
-        Assert.True(world.Lookup("P.C2") == parent.Lookup("C2"));
-        Assert.True(world.Lookup("P.C3") == parent.Lookup("C3"));
-
-        Component<Self> self = world.Component<Self>();
-        Assert.True(!self.Has(Ecs.ChildOf, parent));
-
-        int count = 0;
-        using Query q = world.QueryBuilder()
-            .With(Ecs.ChildOf, parent)
-            .Build();
-
-        q.Each((Entity e) =>
-        {
-            Assert.True(e.Has(Ecs.ChildOf, parent));
-
-            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
-
-            count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void WithScopeNested()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity("P").Scope(() =>
-        {
-            Entity child = world.Entity("C").Scope(() =>
-            {
-                Entity gchild = world.Entity("GC");
-                Assert.True(gchild == world.Lookup("GC"));
-                Assert.True(gchild == world.Lookup(".P.C.GC"));
-            });
-
-            Assert.True(world.Lookup("C") == child);
-            Assert.True(world.Lookup(".P.C") == child);
-            Assert.True(world.Lookup(".P.C.GC") != 0);
-        });
-
-        Assert.True(0 == world.Lookup("C"));
-        Assert.True(0 == world.Lookup("GC"));
-        Assert.True(0 == world.Lookup("C.GC"));
-
-        Entity child = world.Lookup("P.C");
-        Assert.True(0 != child);
-        Assert.True(child.Has(Ecs.ChildOf, parent));
-
-        Entity gchild = world.Lookup("P.C.GC");
-        Assert.True(0 != gchild);
-        Assert.True(gchild.Has(Ecs.ChildOf, child));
-    }
-
-    [Fact]
-    private void WithScopeNestedSameNameAsParent()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity("P").Scope(() =>
-        {
-            Entity child = world.Entity("C").Scope(() =>
-            {
-                Entity gchild = world.Entity("C");
-                Assert.True(gchild == world.Lookup("C"));
-                Assert.True(gchild == world.Lookup(".P.C.C"));
-            });
-
-            Assert.True(world.Lookup("C") == child);
-            Assert.True(world.Lookup(".P.C") == child);
-            Assert.True(world.Lookup(".P.C.C") != 0);
-        });
-
-        Assert.True(0 == world.Lookup("C"));
-        Assert.True(0 == world.Lookup("C"));
-        Assert.True(0 == world.Lookup("C.C"));
-
-        Entity child = world.Lookup("P.C");
-        Assert.True(0 != child);
-        Assert.True(child.Has(Ecs.ChildOf, parent));
-
-        Entity gchild = world.Lookup("P.C.C");
-        Assert.True(0 != gchild);
-        Assert.True(gchild.Has(Ecs.ChildOf, child));
-    }
-
-    [Fact]
-    private void NoRecursiveLookup()
-    {
-        using World world = World.Create();
-
-        Entity p = world.Entity("P");
-        Entity c = world.Entity("C").ChildOf(p);
-        Entity gc = world.Entity("GC").ChildOf(c);
-
-        Assert.True(c.Lookup("GC") == gc);
-        Assert.True(c.Lookup("C") == 0);
-        Assert.True(c.Lookup("P") == 0);
-    }
-
-    [Fact]
-    private void DeferNewWithName()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-
-        world.Defer(() =>
-        {
-            e = world.Entity("Foo");
-            Assert.True(e != 0);
-        });
-
-        Assert.True(e.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Foo", e.Name());
-    }
-
-    [Fact]
-    private void DeferNewWithNestedName()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-
-        world.Defer(() =>
-        {
-            e = world.Entity("Foo.Bar");
-            Assert.True(e != 0);
-        });
-
-        Assert.True(e.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Bar", e.Name());
-        Assert.Equal(".Foo.Bar", e.Path());
-    }
-
-
-    [Fact]
-    private void DeferNewWithScopeName()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-        Entity parent = world.Entity("Parent");
-
-        world.Defer(() =>
-        {
-            parent.Scope(() =>
-            {
-                e = world.Entity("Foo");
-                Assert.True(e != 0);
-            });
-        });
-
-        Assert.True(e.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Foo", e.Name());
-        Assert.Equal(".Parent.Foo", e.Path());
-    }
-
-    [Fact]
-    private void DeferNewWithScopeNestedName()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-        Entity parent = world.Entity("Parent");
-
-        world.Defer(() =>
-        {
-            parent.Scope(() =>
-            {
-                e = world.Entity("Foo.Bar");
-                Assert.True(e != 0);
-            });
-        });
-
-        Assert.True(e.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Bar", e.Name());
-        Assert.Equal(".Parent.Foo.Bar", e.Path());
-    }
-
-    [Fact]
-    private void DeferNewWithDeferredScopeNestedName()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-        Entity parent = default;
-
-        world.Defer(() =>
-        {
-            parent = world.Entity("Parent").Scope(() =>
-            {
-                e = world.Entity("Foo.Bar");
-                Assert.True(e != 0);
-            });
-        });
-
-        Assert.True(parent.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Parent", parent.Name());
-        Assert.Equal(".Parent", parent.Path());
-
-        Assert.True(e.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Bar", e.Name());
-        Assert.Equal(".Parent.Foo.Bar", e.Path());
-    }
-
-    [Fact]
-    private void DeferNewWithScope()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-        Entity parent = world.Entity();
-
-        world.Defer(() =>
-        {
-            parent.Scope(() =>
-            {
-                e = world.Entity();
-                Assert.True(e != 0);
-            });
-        });
-
-        Assert.True(e.Has(EcsChildOf, parent));
-    }
-
-    [Fact]
-    private void DeferNewWithWith()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-        Entity tag = world.Entity();
-
-        world.Defer(() =>
-        {
-            tag.With(() =>
-            {
-                e = world.Entity();
-                Assert.True(e != 0);
-                Assert.True(!e.Has(tag));
-            });
-        });
-
-        Assert.True(e.Has(tag));
-    }
-
-    [Fact]
-    private void DeferNewWithNameScopeWith()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-        Entity tag = world.Entity();
-        Entity parent = world.Entity("Parent");
-
-        world.Defer(() =>
-        {
-            tag.With(() =>
-            {
-                parent.Scope(() =>
-                {
-                    e = world.Entity("Foo");
-                    Assert.True(e != 0);
-                    Assert.True(!e.Has(tag));
-                });
-                Assert.True(!e.Has(tag));
-            });
-            Assert.True(!e.Has(tag));
-        });
-
-        Assert.True(e.Has(tag));
-        Assert.True(e.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Foo", e.Name());
-        Assert.Equal(".Parent.Foo", e.Path());
-    }
-
-    [Fact]
-    private void DeferNewWithNestedNameScopeWith()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-        Entity tag = world.Entity();
-        Entity parent = world.Entity("Parent");
-
-        world.Defer(() =>
-        {
-            tag.With(() =>
-            {
-                parent.Scope(() =>
-                {
-                    e = world.Entity("Foo.Bar");
-                    Assert.True(e != 0);
-                    Assert.True(!e.Has(tag));
-                });
-                Assert.True(!e.Has(tag));
-            });
-            Assert.True(!e.Has(tag));
-        });
-
-        Assert.True(e.Has(tag));
-        Assert.True(e.Has<EcsIdentifier>(EcsName));
-        Assert.Equal("Bar", e.Name());
-        Assert.Equal(".Parent.Foo.Bar", e.Path());
-    }
-
-    [Fact]
-    private void DeferWithWithImplicitComponent()
-    {
-        using World world = World.Create();
-
-        Entity e = default;
-
-        world.Defer(() =>
-        {
-            world.With<Tag>(() =>
-            {
-                e = world.Entity();
-                Assert.True(!e.Has<Tag>());
-            });
-            Assert.True(!e.Has<Tag>());
-        });
-
-        Assert.True(e.Has<Tag>());
-    }
-
-    [Fact]
-    private void DeferSuspendResume()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        world.Defer(() =>
-        {
-            e.Add<Tag0>();
-            Assert.True(!e.Has<Tag0>());
-
-            world.DeferSuspend();
-            e.Add<Tag1>();
-            Assert.True(!e.Has<Tag0>());
-            Assert.True(e.Has<Tag1>());
-            world.DeferResume();
-
-            Assert.True(!e.Has<Tag0>());
-            Assert.True(e.Has<Tag1>());
-        });
-
-        Assert.True(e.Has<Tag0>());
-        Assert.True(e.Has<Tag1>());
-    }
-
-    [Fact]
-    private void DeferEnsure()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        world.DeferBegin();
-        Position* p = e.EnsurePtr<Position>();
-        p->X = 10;
-        p->Y = 20;
-        world.DeferEnd();
-
-        p = e.GetMutPtr<Position>();
-        Assert.True(p != null);
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-    }
-
-    [Fact]
-    private void WithAfterBuilderMethod()
-    {
-        using World world = World.Create();
-
-        Entity a = world.Entity()
-            .Set(new Position(10, 20))
-            .With(() => { world.Entity("X"); });
-
-        Entity b = world.Entity().Set(new Position(30, 40))
-            .With<Likes>(() => { world.Entity("Y"); });
-
-        Entity c = world.Entity().Set(new Position(50, 60))
-            .With(EcsIsA, () => { world.Entity("Z"); });
-
-        Assert.True(a.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-        }));
-
-        Assert.True(b.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(30, p.X);
-            Assert.Equal(40, p.Y);
-        }));
-
-        Assert.True(c.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(50, p.X);
-            Assert.Equal(60, p.Y);
-        }));
-
-        Entity x = world.Lookup("X");
-        Assert.True(x != 0);
-        Assert.True(x.Has(a));
-
-        Entity y = world.Lookup("Y");
-        Assert.True(y != 0);
-        Assert.True(y.Has<Likes>(b));
-
-        Entity z = world.Lookup("Z");
-        Assert.True(z != 0);
-        Assert.True(z.Has(EcsIsA, c));
-    }
-
-    [Fact]
-    private void WithBeforeBuilderMethod()
-    {
-        using World world = World.Create();
-
-        Entity a = world.Entity()
-            .With(() => { world.Entity("X"); })
-            .Set(new Position(10, 20));
-
-        Entity b = world.Entity()
-            .With<Likes>(() => { world.Entity("Y"); })
-            .Set(new Position(30, 40));
-
-        Entity c = world.Entity()
-            .With(EcsIsA, () => { world.Entity("Z"); })
-            .Set(new Position(50, 60));
-
-        Assert.True(a.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-        }));
-
-        Assert.True(b.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(30, p.X);
-            Assert.Equal(40, p.Y);
-        }));
-
-        Assert.True(c.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(50, p.X);
-            Assert.Equal(60, p.Y);
-        }));
-
-        Entity x = world.Lookup("X");
-        Assert.True(x != 0);
-        Assert.True(x.Has(a));
-
-        Entity y = world.Lookup("Y");
-        Assert.True(y != 0);
-        Assert.True(y.Has<Likes>(b));
-
-        Entity z = world.Lookup("Z");
-        Assert.True(z != 0);
-        Assert.True(z.Has(EcsIsA, c));
-    }
-
-    [Fact]
-    private void ScopeAfterBuilderMethod()
-    {
-        using World world = World.Create();
-
-        world.Entity("P")
-            .Set(new Position(10, 20))
-            .Scope(() => { world.Entity("C"); });
-
-        Entity c = world.Lookup("P.C");
-        Assert.True(c != 0);
-    }
-
-    [Fact]
-    private void ScopeBeforeBuilderMethod()
-    {
-        using World world = World.Create();
-
-        world.Entity("P")
-            .Scope(() => { world.Entity("C"); })
-            .Set(new Position(10, 20));
-
-        Entity c = world.Lookup("P.C");
-        Assert.True(c != 0);
-    }
-
-
-    [Fact]
-    private void EntityIdStr()
-    {
-        using World world = World.Create();
-
-        Id id = world.Entity("Foo");
-
-        Assert.Equal("Foo", id.Str());
-    }
-
-    [Fact]
-    private void PairIdStr()
-    {
-        using World world = World.Create();
-
-        Id id = world.Pair(world.Entity("Rel"), world.Entity("Obj"));
-
-        Assert.Equal("(Rel,Obj)", id.Str());
-    }
-
-    [Fact]
-    private void RoleIdStr()
-    {
-        using World world = World.Create();
-
-        Id id = new Id(world, ECS_AUTO_OVERRIDE | world.Entity("Foo"));
-
-        Assert.Equal("AUTO_OVERRIDE|Foo", id.Str());
-    }
-
-    [Fact]
-    private void IdStrFromEntity()
-    {
-        using World world = World.Create();
-
-        Entity id = world.Entity("Foo");
-
-        Assert.Equal("Foo", id.Str());
-    }
-
-    [Fact]
-    private void NullEntity()
-    {
-        Entity e = Entity.Null();
-        Assert.True(e.Id == 0);
-    }
-
-    [Fact]
-    private void NullEntityWithWorld()
-    {
-        using World world = World.Create();
-
-        Entity e = Entity.Null(world);
-        Assert.True(e.Id == 0);
-        Assert.True(e.World == world);
-    }
-
-    [Fact]
-    private void NullEntityWith0()
-    {
-        Entity e = new Entity(0);
-        Assert.True(e.Id == 0);
-        Assert.True(e.World == null);
-    }
-
-    [Fact]
-    private void NullENtityWithWorldWith0()
-    {
-        using World world = World.Create();
-
-        Entity e = Entity.Null(world);
-        Assert.True(e.Id == 0);
-        Assert.True(e.World == world);
-    }
-
-    [Fact]
-    private void IsWildcard()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity();
-
-        Entity p0 = e1;
-        Id p1 = world.Pair(e1, e2);
-        Id p2 = world.Pair(e1, Ecs.Wildcard);
-        Id p3 = world.Pair(Ecs.Wildcard, e2);
-        Id p4 = world.Pair(Ecs.Wildcard, Ecs.Wildcard);
-
-        Assert.False(e1.IsWildCard());
-        Assert.False(e2.IsWildCard());
-        Assert.False(p0.IsWildCard());
-        Assert.False(p1.IsWildCard());
-        Assert.True(p2.IsWildCard());
-        Assert.True(p3.IsWildCard());
-        Assert.True(p4.IsWildCard());
-    }
-
-    [Fact]
-    private void HasUlong()
-    {
-        using World world = World.Create();
-
-        ulong id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        ulong id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1);
-
-        Assert.True(e != 0);
-        Assert.True(e.Has(id1));
-        Assert.False(e.Has(id2));
-    }
-
-    [Fact]
-    private void HasPairUlong()
-    {
-        using World world = World.Create();
-
-        ulong id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        ulong id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        ulong id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1, id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Has(id1, id2));
-        Assert.False(e.Has(id1, id3));
-    }
-
-    [Fact]
-    private void HasPairUlongWithType()
-    {
-        using World world = World.Create();
-
-        ulong id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        ulong id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add<Rel>(id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Has<Rel>(id2));
-        Assert.False(e.Has<Rel>(id3));
-    }
-
-    [Fact]
-    private void HasId()
-    {
-        using World world = World.Create();
-
-        Id id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        Id id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1);
-
-        Assert.True(e != 0);
-        Assert.True(e.Has(id1));
-        Assert.False(e.Has(id2));
-    }
-
-    [Fact]
-    private void HasPairId()
-    {
-        using World world = World.Create();
-
-        Id id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        Id id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Id id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1, id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Has(id1, id2));
-        Assert.False(e.Has(id1, id3));
-    }
-
-    [Fact]
-    private void HasPairIdWithType()
-    {
-        using World world = World.Create();
-
-        Id id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Id id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add<Rel>(id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Has<Rel>(id2));
-        Assert.False(e.Has<Rel>(id3));
-    }
-
-    [Fact]
-    private void HasWildCardId()
-    {
-        using World world = World.Create();
-
-        Id id = world.Entity();
-        Assert.True(id != 0);
-
-        Entity e1 = world.Entity().Add(id);
-        Entity e2 = world.Entity();
-
-        Assert.True(e1 != 0);
-        Assert.True(e2 != 0);
-
-        Assert.True(e1.Has(Ecs.Wildcard));
-        Assert.False(e2.Has(Ecs.Wildcard));
-    }
-
-    [Fact]
-    private void HasWildCardPairId()
-    {
-        using World world = World.Create();
-
-        Id rel = world.Entity();
-        Assert.True(rel != 0);
-
-        Id obj = world.Entity();
-        Assert.True(obj != 0);
-
-        Id obj2 = world.Entity();
-        Assert.True(obj2 != 0);
-
-        Id w1 = world.Id(rel, Ecs.Wildcard);
-        Id w2 = world.Id(Ecs.Wildcard, obj);
-
-        Entity e1 = world.Entity().Add(rel, obj);
-        Entity e2 = world.Entity().Add(rel, obj2);
-
-        Assert.True(e1 != 0);
-        Assert.True(e2 != 0);
-
-        Assert.True(e1.Has(w1));
-        Assert.True(e1.Has(w2));
-
-        Assert.True(e2.Has(w1));
-        Assert.False(e2.Has(w2));
-    }
-
-    [Fact]
-    private void OwnsUlong()
-    {
-        using World world = World.Create();
-
-        ulong id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        ulong id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1);
-
-        Assert.True(e != 0);
-        Assert.True(e.Owns(id1));
-        Assert.False(e.Owns(id2));
-    }
-
-    [Fact]
-    private void OwnsPairUlong()
-    {
-        using World world = World.Create();
-
-        ulong id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        ulong id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        ulong id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1, id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Owns(id1, id2));
-        Assert.False(e.Owns(id1, id3));
-    }
-
-    [Fact]
-    private void OwnsPairUlongWithType()
-    {
-        using World world = World.Create();
-
-        ulong id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        ulong id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add<Rel>(id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Owns<Rel>(id2));
-        Assert.False(e.Owns<Rel>(id3));
-    }
-
-    [Fact]
-    private void OwnsId()
-    {
-        using World world = World.Create();
-
-        Id id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        Id id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1);
-
-        Assert.True(e != 0);
-        Assert.True(e.Owns(id1));
-        Assert.False(e.Owns(id2));
-    }
-
-    [Fact]
-    private void OwnsPairId()
-    {
-        using World world = World.Create();
-
-        Id id1 = world.Entity();
-        Assert.True(id1 != 0);
-
-        Id id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Id id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add(id1, id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Owns(id1, id2));
-        Assert.False(e.Owns(id1, id3));
-    }
-
-    [Fact]
-    private void OwnsWildCardId()
-    {
-        using World world = World.Create();
-
-        Id id = world.Entity();
-        Assert.True(id != 0);
-
-        Entity e1 = world.Entity().Add(id);
-        Entity e2 = world.Entity();
-
-        Assert.True(e1 != 0);
-        Assert.True(e2 != 0);
-
-        Assert.True(e1.Owns(Ecs.Wildcard));
-        Assert.False(e2.Owns(Ecs.Wildcard));
-    }
-
-    [Fact]
-    private void OwnsWildcardPair()
-    {
-        using World world = World.Create();
-
-        Id rel = world.Entity();
-        Assert.True(rel != 0);
-
-        Id obj = world.Entity();
-        Assert.True(obj != 0);
-
-        Id obj2 = world.Entity();
-        Assert.True(obj2 != 0);
-
-        Id w1 = world.Id(rel, Ecs.Wildcard);
-        Id w2 = world.Id(Ecs.Wildcard, obj);
-
-        Entity e1 = world.Entity().Add(rel, obj);
-        Entity e2 = world.Entity().Add(rel, obj2);
-
-        Assert.True(e1 != 0);
-        Assert.True(e2 != 0);
-
-        Assert.True(e1.Owns(w1));
-        Assert.True(e1.Owns(w2));
-
-        Assert.True(e2.Owns(w1));
-        Assert.False(e2.Owns(w2));
-    }
-
-    [Fact]
-    private void OwnsPairIdWithType()
-    {
-        using World world = World.Create();
-
-        Id id2 = world.Entity();
-        Assert.True(id2 != 0);
-
-        Id id3 = world.Entity();
-        Assert.True(id3 != 0);
-
-        Entity e = world.Entity()
-            .Add<Rel>(id2);
-
-        Assert.True(e != 0);
-        Assert.True(e.Owns<Rel>(id2));
-        Assert.False(e.Owns<Rel>(id3));
-    }
-
-    [Fact]
-    private void IdFromWorld()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Assert.True(e != 0);
-
-        Id id1 = world.Id(e);
-        Assert.True(id1 != 0);
-        Assert.True(id1 == e);
-        Assert.True(id1.World == world);
-        Assert.False(id1.IsPair());
-        Assert.False(id1.IsWildCard());
-
-        Id id2 = world.Id(Ecs.Wildcard);
-        Assert.True(id2 != 0);
-        Assert.True(id2 == Ecs.Wildcard);
-        Assert.True(id2.World == world);
-        Assert.False(id2.IsPair());
-        Assert.True(id2.IsWildCard());
-    }
-
-    [Fact]
-    private void IdPairFromWorld()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Assert.True(rel != 0);
-
-        Entity obj = world.Entity();
-        Assert.True(obj != 0);
-
-        Id id1 = world.Id(rel, obj);
-        Assert.True(id1 != 0);
-        Assert.True(id1.First() == rel);
-        Assert.True(id1.Second() == obj);
-        Assert.True(id1.World == world);
-        Assert.True(id1.IsPair());
-        Assert.False(id1.IsWildCard());
-
-        Id id2 = world.Id(rel, Ecs.Wildcard);
-        Assert.True(id2 != 0);
-        Assert.True(id2.First() == rel);
-        Assert.True(id2.Second() == Ecs.Wildcard);
-        Assert.True(id2.World == world);
-        Assert.True(id2.IsPair());
-        Assert.True(id2.IsWildCard());
-    }
-
-    [Fact]
-    private void IdDefaultFromWorld()
-    {
-        using World world = World.Create();
-
-        Id idDefault = world.Id();
-        Assert.True(idDefault == 0);
-    }
-
-    [Fact]
-    private void IsA()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity();
-
-        Entity e = world.Entity().IsA(@base);
-
-        Assert.True(e.Has(EcsIsA, @base));
-    }
-
-    [Fact]
-    private void IsAWithType()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity<Prefab>();
-
-        Entity e = world.Entity().IsA<Prefab>();
-
-        Assert.True(e.Has(Ecs.IsA, @base));
-        Assert.True(e.HasSecond<Prefab>(Ecs.IsA));
-    }
-
-    [Fact]
-    private void ChildOf()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity();
-
-        Entity e = world.Entity().ChildOf(@base);
-
-        Assert.True(e.Has(Ecs.ChildOf, @base));
-    }
-
-    [Fact]
-    private void ChildOfWithType()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity<Parent>();
-
-        Entity e = world.Entity().ChildOf<Parent>();
-
-        Assert.True(e.Has(EcsChildOf, @base));
-        Assert.True(e.HasSecond<Parent>(EcsChildOf));
-    }
-
-    [Fact]
-    private void SlotOf()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Prefab();
-        Entity baseChild = world.Prefab()
-            .ChildOf(@base)
-            .SlotOf(@base);
-
-        Assert.True(baseChild.Has(Ecs.SlotOf, @base));
-
-        Entity inst = world.Entity().IsA(@base);
-        Assert.True(inst.Has(baseChild, Ecs.Wildcard));
-    }
-
-    [Fact]
-    private void SlotOfWithType()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Prefab<Parent>();
-        Entity baseChild = world.Prefab()
-            .ChildOf(@base)
-            .SlotOf<Parent>();
-
-        Assert.True(baseChild.Has(Ecs.SlotOf, @base));
-
-        Entity inst = world.Entity().IsA(@base);
-        Assert.True(inst.Has(baseChild, Ecs.Wildcard));
-    }
-
-    [Fact]
-    private void Slot()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Prefab();
-        Entity baseChild = world.Prefab()
-            .ChildOf(@base).Slot();
-
-        Assert.True(baseChild.Has(Ecs.SlotOf, @base));
-
-        Entity inst = world.Entity().IsA(@base);
-        Assert.True(inst.Has(baseChild, Ecs.Wildcard));
-    }
-
-    [Fact]
-    private void IdGetEntity()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        Id id = world.Id(e);
-
-        Assert.True(id.ToEntity() == e);
-    }
-
-    [Fact]
-    private void EachInStage()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Add<Rel, Obj>();
-        Assert.True(e.Has<Rel, Obj>());
-
-        world.ReadonlyBegin();
-
-        World s = world.GetStage(0);
-        Entity em = e.Mut(s);
-        Assert.True(em.Has<Rel, Obj>());
-
-        int count = 0;
-
-        em.Each<Rel>((Entity obj) =>
-        {
-            count++;
-            Assert.True(obj == world.Id<Obj>());
-        });
-
-        Assert.Equal(1, count);
-
-        world.ReadonlyEnd();
-    }
-
-    [Fact]
-    private void IterRecycledParent()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        e.Destruct();
-
-        Entity e2 = world.Entity();
-        Assert.True(e != e2);
-        Assert.True((uint)e.Id == (uint)e2.Id);
-
-        Entity eChild = world.Entity().ChildOf(e2);
-        int count = 0;
-
-        e2.Children((Entity child) =>
-        {
-            count++;
-            Assert.True(child == eChild);
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void GetLambdaFromStage()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Set(new Position(10, 20));
-
-        world.ReadonlyBegin();
-
-        World stage = world.GetStage(0);
-
-        bool invoked = false;
-        e.Mut(stage).Read((ref readonly Position p) =>
-        {
-            invoked = true;
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-        });
-        Assert.True(invoked);
-
-        world.ReadonlyEnd();
-    }
-
-
-    [Fact]
-    private void GetObjByTemplate()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity o1 = world.Entity();
-        Entity o2 = world.Entity();
-
-        e1.Add<Rel>(o1);
-        e1.Add<Rel>(o2);
-
-        Assert.True(o1 == e1.Target<Rel>());
-        Assert.True(o1 == e1.Target<Rel>(0));
-        Assert.True(o2 == e1.Target<Rel>(1));
-    }
-
-    [Fact]
-    private void CreateNamedTwiceDeferred()
-    {
-        using World world = World.Create();
-
-        world.DeferBegin();
-
-        Entity e1 = world.Entity("e");
-        Entity e2 = world.Entity("e");
-
-        Entity f1 = world.Entity("p.f");
-        Entity f2 = world.Entity("p.f");
-
-        Entity g1 = default;
-        Entity g2 = default;
-
-        world.Scope(world.Entity("q"), () => { g1 = world.Entity("g"); });
-
-        world.Scope(world.Entity("q"), () => { g2 = world.Entity("g"); });
-
-        world.DeferEnd();
-
-        Assert.Equal(".e", e1.Path());
-        Assert.Equal(".p.f", f1.Path());
-        Assert.Equal(".q.g", g1.Path());
-
-        Assert.True(e1 == e2);
-        Assert.True(f1 == f2);
-        Assert.True(g1 == g2);
-    }
-
-    [Fact]
-    private void Clone()
-    {
-        using World world = World.Create();
-
-        PositionInitialized v = new PositionInitialized(10, 20);
-
-        Entity src = world.Entity().Add<Tag>().Set(v);
-        Entity dst = src.Clone(false);
-        Assert.True(dst.Has<Tag>());
-        Assert.True(dst.Has<PositionInitialized>());
-
-        PositionInitialized* ptr = dst.GetPtr<PositionInitialized>();
-        Assert.True(ptr != null);
-        Assert.NotEqual(10, ptr->X);
-        Assert.NotEqual(20, ptr->Y);
-    }
-
-    [Fact]
-    private void CloneWithValue()
-    {
-        using World world = World.Create();
-
-        PositionInitialized v = new PositionInitialized(10, 20);
-
-        Entity src = world.Entity().Add<Tag>().Set(v);
-        Entity dst = src.Clone();
-        Assert.True(dst.Has<Tag>());
-        Assert.True(dst.Has<PositionInitialized>());
-
-        PositionInitialized* ptr = dst.GetPtr<PositionInitialized>();
-        Assert.True(ptr != null);
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void CloneToExisting()
-    {
-        using World world = World.Create();
-
-        PositionInitialized v = new PositionInitialized(10, 20);
-
-        Entity src = world.Entity().Add<Tag>().Set(v);
-        Entity dst = world.Entity();
-        Entity result = src.Clone(true, dst);
-        Assert.True(result == dst);
-
-        Assert.True(dst.Has<Tag>());
-        Assert.True(dst.Has<PositionInitialized>());
-
-        PositionInitialized* ptr = dst.GetPtr<PositionInitialized>();
-        Assert.True(ptr != null);
-        Assert.Equal(10, ptr->X);
-        Assert.Equal(20, ptr->Y);
-    }
-
-    [Fact]
-    private void SetDocName()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity("foo_bar")
-            .SetDocName("Foo Bar");
-
-        Assert.Equal("foo_bar", e.Name());
-        Assert.Equal("Foo Bar", e.DocName());
-    }
-
-    [Fact]
-    private void SetDocBrief()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity("foo_bar")
-            .SetDocBrief("Foo Bar");
-
-        Assert.Equal("foo_bar", e.Name());
-        Assert.Equal("Foo Bar", e.DocBrief());
-    }
-
-    [Fact]
-    private void SetDocDetail()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity("foo_bar")
-            .SetDocDetail("Foo Bar");
-
-        Assert.Equal("foo_bar", e.Name());
-        Assert.Equal("Foo Bar", e.DocDetail());
-    }
-
-    [Fact]
-    private void SetDocLink()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity("foo_bar")
-            .SetDocLink("Foo Bar");
-
-        Assert.Equal("foo_bar", e.Name());
-        Assert.Equal("Foo Bar", e.DocLink());
-    }
-
-    [Fact]
-    private void EntityWithRootName()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity(".foo");
-        Assert.Equal("foo", e.Name());
-        Assert.Equal(".foo", e.Path());
-    }
-
-    [Fact]
-    private void EntityWithRootNameFromScope()
-    {
-        using World world = World.Create();
-
-        Entity p = world.Entity("parent");
-        world.SetScope(p);
-        Entity e = world.Entity(".foo");
-        world.SetScope(0);
-
-        Assert.Equal("foo", e.Name());
-        Assert.Equal(".foo", e.Path());
-    }
-
-    [Fact]
-    private void EntityWithType()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity<EntityType>();
-
-        Assert.Equal("EntityType", e.Name());
-        Assert.Equal(".EntityType", e.Path());
-
-        Entity e2 = world.Entity<EntityType>();
-        Assert.True(e == e2);
-    }
-
-    [Fact]
-    private void PrefabWithType()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Prefab<EntityType>();
-
-        Assert.Equal("EntityType", e.Name());
-        Assert.Equal(".EntityType", e.Path());
-        Assert.True(e.Has<EcsComponent>());
-        Assert.True(e.Has(Ecs.Prefab));
-
-        Entity e2 = world.Entity<EntityType>();
-        Assert.True(e == e2);
-    }
-
-    [Fact]
-    private void PrefabHierarchyWithTypes()
-    {
-        using World world = World.Create();
-
-        Entity turret = world.Prefab<Turret>();
-        Entity turretBase = world.Prefab<Turret.Base>();
-
-        Assert.True(turret != 0);
-        Assert.True(turretBase != 0);
-        Assert.True(turretBase.Has(EcsChildOf, turret));
-
-        Assert.Equal(".Turret", turret.Path());
-        Assert.Equal(".Turret.Base", turretBase.Path());
-
-        Assert.Equal("Turret", turret.Symbol());
-        Assert.Equal("Turret.Base", turretBase.Symbol());
-
-        Entity railgun = world.Prefab<Railgun>().IsA<Turret>();
-        Entity railgunBase = railgun.Lookup("Base");
-        Entity railgunHead = world.Prefab<Railgun.Head>();
-        Entity railgunBeam = world.Prefab<Railgun.Beam>();
-
-        Assert.True(railgun != 0);
-        Assert.True(railgunBase != 0);
-        Assert.True(railgunHead != 0);
-        Assert.True(railgunBeam != 0);
-        Assert.True(railgunBase.Has(EcsChildOf, railgun));
-        Assert.True(railgunHead.Has(EcsChildOf, railgun));
-        Assert.True(railgunBeam.Has(EcsChildOf, railgun));
-
-        Assert.Equal(".Railgun", railgun.Path());
-        Assert.Equal(".Railgun.Base", railgunBase.Path());
-        Assert.Equal(".Railgun.Head", railgunHead.Path());
-        Assert.Equal(".Railgun.Beam", railgunBeam.Path());
-
-        Assert.Equal("Railgun", railgun.Symbol());
-        Assert.Equal("Railgun.Head", railgunHead.Symbol());
-        Assert.Equal("Railgun.Beam", railgunBeam.Symbol());
-    }
-
-    [Fact]
-    private void PrefabHierarchyWithRootTypes()
-    {
-        using World world = World.Create();
-
-        Entity turret = world.Prefab<Turret>();
-        Entity turretBase = world.Prefab<Base>().ChildOf<Turret>();
-
-        Assert.True(turret != 0);
-        Assert.True(turretBase != 0);
-        Assert.True(turretBase.Has(EcsChildOf, turret));
-
-        Assert.Equal(".Turret", turret.Path());
-        Assert.Equal(".Turret.Base", turretBase.Path());
-
-        Assert.Equal("Turret", turret.Symbol());
-        Assert.Equal("Base", turretBase.Symbol());
-
-        Entity inst = world.Entity().IsA<Turret>();
-        Assert.True(inst != 0);
-
-        Entity instBase = inst.Lookup("Base");
-        Assert.True(instBase != 0);
-    }
-
-    [Fact]
-    private void PrefabHierarchyWithChildOverride()
-    {
-        using World world = World.Create();
-
-        Entity t = world.Prefab<Turret>();
-        Entity tb = world.Prefab<Turret.Base>().Add<Foo>();
-        Assert.True(t != 0);
-        Assert.True(tb != 0);
-
-        Entity r = world.Prefab<Railgun>().IsA<Turret>();
-        Entity rb = world.Prefab<Railgun.Base>().Add<Bar>();
-        Assert.True(r != 0);
-        Assert.True(rb != 0);
-
-        Entity i = world.Entity().IsA<Railgun>();
-        Assert.True(i != 0);
-        Entity ib = i.Lookup("Base");
-        Assert.True(ib != 0);
-        Assert.True(ib.Has<Foo>());
-        Assert.True(ib.Has<Bar>());
-    }
-
-    [Fact]
-    private void EntityWithNestedType()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity<Parent.EntityType>();
-        Entity p = world.Entity<Parent>();
-
-        Assert.Equal("EntityType", e.Name());
-        Assert.Equal(".Parent.EntityType", e.Path());
-        Assert.True(e.Has(EcsChildOf, p));
-
-        Entity e2 = world.Entity<Parent.EntityType>();
-        Assert.True(e == e2);
-    }
-
-    [Fact]
-    private void EntityWithTypeDefer()
-    {
-        using World world = World.Create();
-
-        world.DeferBegin();
-        Entity e = world.Entity<Tag>();
-        world.DeferEnd();
-
-        Assert.Equal("Tag", e.Name());
-        Assert.Equal("Tag", e.Symbol());
-        Assert.True(world.Id<Tag>() == e);
-    }
-
-    [Fact]
-    private void AddIfTrueT()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        e.AddIf<Tag>(true);
-        Assert.True(e.Has<Tag>());
-    }
-
-    [Fact]
-    private void AddIfFalseT()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        e.AddIf<Tag>(false);
-        Assert.True(!e.Has<Tag>());
-
-        e.Add<Tag>();
-        Assert.True(e.Has<Tag>());
-        e.AddIf<Tag>(false);
-        Assert.True(!e.Has<Tag>());
-    }
-
-    [Fact]
-    private void AddIfTrueId()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity t = world.Entity();
-
-        e.AddIf(true, t);
-        Assert.True(e.Has(t));
-    }
-
-    [Fact]
-    private void AddIfFalseId()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity t = world.Entity();
-
-        e.AddIf(false, t);
-        Assert.True(!e.Has(t));
-        e.Add(t);
-        Assert.True(e.Has(t));
-        e.AddIf(false, t);
-        Assert.True(!e.Has(t));
-    }
-
-    [Fact]
-    private void AddIfTrueRO()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        e.AddIf<Rel, Obj>(true);
-        Assert.True(e.Has<Rel, Obj>());
-    }
-
-    [Fact]
-    private void AddIfFalseRO()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        e.AddIf<Rel, Obj>(false);
-        Assert.True(!e.Has<Rel, Obj>());
-        e.Add<Rel, Obj>();
-        Assert.True(e.Has<Rel, Obj>());
-        e.AddIf<Rel, Obj>(false);
-        Assert.True(!e.Has<Rel, Obj>());
-    }
-
-    [Fact]
-    private void AddIfTrueRo()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity o = world.Entity();
-
-        e.AddIf<Rel>(true, o);
-        Assert.True(e.Has<Rel>(o));
-    }
-
-    [Fact]
-    private void AddIfFalseRo()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity o = world.Entity();
-
-        e.AddIf<Rel>(false, o);
-        Assert.True(!e.Has<Rel>(o));
-        e.Add<Rel>(o);
-        Assert.True(e.Has<Rel>(o));
-        e.AddIf<Rel>(false, o);
-        Assert.True(!e.Has<Rel>(o));
-    }
-
-    [Fact]
-    private void AddIfTruero()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity r = world.Entity();
-        Entity o = world.Entity();
-
-        e.AddIf(true, r, o);
-        Assert.True(e.Has(r, o));
-    }
-
-    [Fact]
-    private void AddIfFalsero()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity r = world.Entity();
-        Entity o = world.Entity();
-
-        e.AddIf(false, r, o);
-        Assert.True(!e.Has(r, o));
-        e.Add(r, o);
-        Assert.True(e.Has(r, o));
-        e.AddIf(false, r, o);
-        Assert.True(!e.Has(r, o));
-    }
-
-    [Fact]
-    private void AddIfExclusivero()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity r = world.Entity().Add(Ecs.Exclusive);
-        Entity o1 = world.Entity();
-        Entity o2 = world.Entity();
-
-        e.Add(r, o1);
-        Assert.True(e.Has(r, o1));
-
-        e.AddIf(true, r, o2);
-        Assert.True(!e.Has(r, o1));
-        Assert.True(e.Has(r, o2));
-
-        e.AddIf(false, r, o1);
-        Assert.True(!e.Has(r, o1));
-        Assert.True(!e.Has(r, o2));
-    }
-
-    [Fact]
-    private void AddIfExclusiveRo()
-    {
-        using World world = World.Create();
-
-        world.Component<First>().Add(Ecs.Exclusive);
-
-        Entity e = world.Entity();
-        Entity o1 = world.Entity();
-        Entity o2 = world.Entity();
-
-        e.Add<First>(o1);
-        Assert.True(e.Has<First>(o1));
-
-        e.AddIf<First>(true, o2);
-        Assert.True(!e.Has<First>(o1));
-        Assert.True(e.Has<First>(o2));
-
-        e.AddIf<First>(false, o1);
-        Assert.True(!e.Has<First>(o1));
-        Assert.True(!e.Has<First>(o2));
-    }
-
-    [Fact]
-    private void AddIfExclusiveRO()
-    {
-        using World world = World.Create();
-
-        world.Component<R>().Add(Ecs.Exclusive);
-
-        Entity e = world.Entity();
-
-        e.Add<R, O1>();
-        Assert.True(e.Has<R, O1>());
-
-        e.AddIf<R, O2>(true);
-        Assert.True(!e.Has<R, O1>());
-        Assert.True(e.Has<R, O2>());
-
-        e.AddIf<R, O1>(false);
-        Assert.True(!e.Has<R, O1>());
-        Assert.True(!e.Has<R, O2>());
-    }
-
-    [Fact]
-    private void AddIfPairWith0Object()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-        Entity r = world.Entity();
-        Entity o1 = world.Entity();
-
-        e.Add(r, o1);
-        Assert.True(e.Has(r, o1));
-
-        e.AddIf(false, r, 0);
-        Assert.True(!e.Has(r, o1));
-        Assert.True(!e.Has(r, Ecs.Wildcard));
-    }
-
-    [Fact]
-    private void ChildrenWithCustomRelation()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-
-        Entity parent = world.Entity();
-        Entity child1 = world.Entity().Add(rel, parent);
-        Entity child2 = world.Entity().Add(rel, parent);
-        world.Entity().ChildOf(parent);
-
-        bool child1Found = false;
-        bool child2Found = false;
-        int count = 0;
-
-        parent.Children(rel, (Entity child) =>
-        {
-            if (child == child1)
-                child1Found = true;
-            else if (child == child2) child2Found = true;
-            count++;
-        });
-
-        Assert.Equal(2, count);
-        Assert.True(child1Found);
-        Assert.True(child2Found);
-    }
-
-    [Fact]
-    private void ChildrenWithCustomRelationType()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity();
-        Entity child1 = world.Entity().Add<Rel>(parent);
-        Entity child2 = world.Entity().Add<Rel>(parent);
-        world.Entity().ChildOf(parent);
-
-        bool child1Found = false;
-        bool child2Found = false;
-        int count = 0;
-
-        parent.Children<Rel>((Entity child) =>
-        {
-            if (child == child1)
-                child1Found = true;
-            else if (child == child2) child2Found = true;
-            count++;
-        });
-
-        Assert.Equal(2, count);
-        Assert.True(child1Found);
-        Assert.True(child2Found);
-    }
-
-    [Fact]
-    private void ChildrenWithThis()
-    {
-        using World world = World.Create();
-
-        int count = 0;
-        world.Entity(Ecs.This).Children((Entity e) => { count++; });
-        Assert.True(count == 0);
-    }
-
-    [Fact]
-    private void ChildrenWithWildcard()
-    {
-        using World world = World.Create();
-
-        int count = 0;
-        world.Entity(Ecs.Wildcard).Children((Entity e) => { count++; });
-        Assert.True(count == 0);
-    }
-
-    [Fact]
-    private void ChildrenWithAny()
-    {
-        using World world = World.Create();
-
-        int count = 0;
-        world.Entity(Ecs.Any).Children((Entity e) => { count++; });
-        Assert.True(count == 0);
-    }
-
-    [Fact]
-    private void GetDepth()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity().ChildOf(e1);
-        Entity e3 = world.Entity().ChildOf(e2);
-        Entity e4 = world.Entity().ChildOf(e3);
-
-        Assert.Equal(0, e1.Depth(EcsChildOf));
-        Assert.Equal(1, e2.Depth(EcsChildOf));
-        Assert.Equal(2, e3.Depth(EcsChildOf));
-        Assert.Equal(3, e4.Depth(EcsChildOf));
-    }
-
-    [Fact]
-    private void GetDepthWithType()
-    {
-        using World world = World.Create();
-
-        world.Component<Rel>().Add(EcsTraversable);
-
-        Entity e1 = world.Entity();
-        Entity e2 = world.Entity().Add<Rel>(e1);
-        Entity e3 = world.Entity().Add<Rel>(e2);
-        Entity e4 = world.Entity().Add<Rel>(e3);
-
-        Assert.Equal(0, e1.Depth<Rel>());
-        Assert.Equal(1, e2.Depth<Rel>());
-        Assert.Equal(2, e3.Depth<Rel>());
-        Assert.Equal(3, e4.Depth<Rel>());
-    }
-
-    [Fact]
-    private void SetAlias()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity("parent.child");
-        e.SetAlias("parent_child");
-
-        Assert.True(e == world.Lookup("parent.child"));
-        Assert.True(e == world.Lookup("parent_child"));
-    }
-
-    [Fact]
-    private void EntityLookupNotRecursive()
-    {
-        using World world = World.Create();
-
-        Entity child = default;
-        Entity foo = default;
-
-        world.Entity("parent").Scope(() =>
-        {
-            child = world.Entity("child");
-            foo = world.Entity("foo");
-        });
-
-        Assert.True(child.Lookup("foo") == 0);
-        Assert.True(child.Lookup("foo", true) == foo);
-    }
-
-    [Fact]
-    private void WorldLookupNotRecursive()
-    {
-        using World world = World.Create();
-
-        Entity child = default;
-        Entity foo = default;
-
-        world.Entity("parent").Scope(() =>
-        {
-            child = world.Entity("child");
-            foo = world.Entity("foo");
-        });
-
-        child.Scope(() =>
-        {
-            Assert.True(world.Lookup("foo") == foo);
-            Assert.True(world.Lookup("foo", ".", ".", false) == 0);
-        });
-    }
-
-    [Fact]
-    private void WorldLookupCustomSep()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity("parent");
-        Entity child = default;
-        Entity foo = default;
-
-        parent.Scope(() =>
-        {
-            child = world.Entity("child");
-            foo = world.Entity("foo");
-        });
-
-        Assert.True(world.Lookup("parent::child", "::") == child);
-        Assert.True(world.Lookup("parent::foo", "::") == foo);
-    }
-
-    [Fact]
-    private void WorldLookupCustomRootSep()
-    {
-        using World world = World.Create();
-
-        Entity parent = world.Entity("parent");
-        Entity child = default;
-        Entity foo = default;
-
-        parent.Scope(() =>
-        {
-            child = world.Entity("child");
-            foo = world.Entity("foo");
-        });
-
-        Assert.True(world.Lookup("::parent::child", "::", "::") == child);
-        Assert.True(world.Lookup("::parent::foo", "::", "::") == foo);
-    }
-
-    [Fact]
-    private void DependsOn()
-    {
-        using World world = World.Create();
-
-        Entity a = world.Entity();
-        Entity b = world.Entity().DependsOn(a);
-        Assert.True(b.Has(Ecs.DependsOn, a));
-    }
-
-    [Fact]
-    private void DependsOnType()
-    {
-        using World world = World.Create();
-
-        Entity b = world.Entity().DependsOn<Position>();
-        Assert.True(b.Has(Ecs.DependsOn, world.Id<Position>()));
-    }
-
-    [Fact]
-    private void SetSparse()
-    {
-        using World world = World.Create();
-
-        world.Component<Velocity>().Add(Ecs.Sparse);
-
-        Entity e = world.Entity().Set(new Velocity(1, 2));
-
-        Assert.True(e.Has<Velocity>());
-
-        Velocity* v = e.GetPtr<Velocity>();
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-    }
-
-    [Fact]
-    private void Insert1Sparse()
-    {
-        using World world = World.Create();
-
-        world.Component<Velocity>().Add(Ecs.Sparse);
-
-        Entity e = world.Entity().Insert((ref Velocity v) =>
-        {
-            v.X = 1;
-            v.Y = 2;
-        });
-
-        Assert.True(e.Has<Velocity>());
-
-        Velocity* v = e.GetPtr<Velocity>();
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-    }
-
-    [Fact]
-    private void Insert2With1Sparse()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>().Add(Ecs.Sparse);
-
-        Entity e = world.Entity().Insert((ref Position p, ref Velocity v) =>
-        {
-            p.X = 10;
-            p.Y = 20;
-            v.X = 1;
-            v.Y = 2;
-        });
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-
-        Position* p = e.GetPtr<Position>();
-        Assert.Equal(10, p->X);
-        Assert.Equal(20, p->Y);
-
-        Velocity* v = e.GetPtr<Velocity>();
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-    }
-
-    [Fact]
-    private void OverrideSparse()
-    {
-        using World world = World.Create();
-
-        world.Component<Velocity>().Add(Ecs.Sparse);
-
-        Entity @base = world.Entity().Set(new Velocity(1, 2));
-
-        Entity e = world.Entity().IsA(@base);
-
-        Assert.True(e.Has<Velocity>());
-        Assert.True(e.Owns<Velocity>());
-
-        Velocity* v = e.GetPtr<Velocity>();
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-    }
-
-    [Fact]
-    private void DeleteWithOverrideSparse()
-    {
-        using World world = World.Create();
-
-        world.Component<Velocity>().Add(Ecs.Sparse);
-
-        Entity @base = world.Entity().Set(new Velocity(1, 2));
-
-        Entity e = world.Entity().IsA(@base);
-
-        Assert.True(e.Has<Velocity>());
-        Assert.True(e.Owns<Velocity>());
-
-        Velocity* v = e.GetPtr<Velocity>();
-        Assert.Equal(1, v->X);
-        Assert.Equal(2, v->Y);
-
-        e.Destruct();
-    }
-
-    [Fact]
-    private void IterType()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Add<Position>().Add<Velocity>();
-
-        int count = 0;
-        bool posFound = false;
-        bool velocityFound = false;
-
-        foreach (Id id in e.Type())
-        {
-            count++;
-
-            if (id == world.Id<Position>())
-                posFound = true;
-
-            if (id == world.Id<Velocity>())
-                velocityFound = true;
-        }
-
-        Assert.Equal(2, count);
-        Assert.True(posFound);
-        Assert.True(velocityFound);
-    }
-
-    [Fact]
-    private void IterEmptyType()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity();
-
-        int count = 0;
-
-        foreach (Id id in e.Type())
-        {
-            Assert.True(id != 0);
-            count++;
-        }
-
-        Assert.Equal(0, count);
-    }
-}
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using Flecs.NET.Core;
+using Xunit;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Tests.Cpp;
+
+[SuppressMessage("ReSharper", "UnusedParameter.Local")]
+[SuppressMessage("ReSharper", "ParameterOnlyUsedForPreconditionCheck.Local")]
+[SuppressMessage("ReSharper", "AccessToDisposedClosure")]
+public unsafe class EntityTests
+{
+    [Fact]
+    public void New()
+    {
+        using World world = World.Create();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+    }
+
+    [Fact]
+    public void NewNamed()
+    {
+        using World world = World.Create();
+
+        Entity entity = new Entity(world, "Foo");
+        Assert.True(entity != 0);
+        Assert.Equal("Foo", entity.Name());
+    }
+
+    [Fact]
+    public void NewNamedFromScope()
+    {
+        using World world = World.Create();
+
+        Entity entity = new Entity(world, "Foo");
+        Assert.True(entity != 0);
+        Assert.Equal("Foo", entity.Name());
+
+        Entity prev = world.SetScope(entity);
+
+        Entity child = world.Entity("Bar");
+        Assert.True(child != 0);
+
+        world.SetScope(prev);
+
+        Assert.Equal("Bar", child.Name());
+        Assert.Equal(".Foo.Bar", child.Path());
+    }
+
+    [Fact]
+    private void NewNestedNamedFromFromScope()
+    {
+        using World world = World.Create();
+
+        Entity entity = new Entity(world, "Foo");
+        Assert.True(entity != 0);
+        Assert.Equal("Foo", entity.Name());
+
+        Entity prev = world.SetScope(entity);
+
+        Entity child = world.Entity("Bar.Hello");
+        Assert.True(child != 0);
+
+        world.SetScope(prev);
+
+        Assert.Equal("Hello", child.Name());
+        Assert.Equal(".Foo.Bar.Hello", child.Path());
+    }
+
+    [Fact]
+    private void NewNestedNamedFromNestedScope()
+    {
+        using World world = World.Create();
+
+        Entity entity = new Entity(world, "Foo.Bar");
+        Assert.True(entity != 0);
+        Assert.Equal("Bar", entity.Name());
+        Assert.Equal(".Foo.Bar", entity.Path());
+
+        Entity prev = world.SetScope(entity);
+
+        Entity child = world.Entity("Hello.World");
+        Assert.True(child != 0);
+
+        world.SetScope(prev);
+
+        Assert.Equal("World", child.Name());
+        Assert.Equal(".Foo.Bar.Hello.World", child.Path());
+    }
+
+    [Fact]
+    private void NewAdd()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+
+        Entity entity = world.Entity()
+            .Add<Position>();
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+    }
+
+    [Fact]
+    private void NewAdd2()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Add<Position>()
+            .Add<Velocity>();
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+        Assert.True(entity.Has<Velocity>());
+    }
+
+    [Fact]
+    private void NewSet()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void NewSet2()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+        Assert.True(entity.Has<Velocity>());
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Velocity* v = entity.GetPtr<Velocity>();
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+    }
+
+    [Fact]
+    private void Add()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add<Position>();
+        Assert.True(entity.Has<Position>());
+    }
+
+    [Fact]
+    private void Remove()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add<Position>();
+        Assert.True(entity.Has<Position>());
+
+        entity.Remove<Position>();
+        Assert.True(!entity.Has<Position>());
+    }
+
+    [Fact]
+    private void Set()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Set(new Position(10, 20));
+        Assert.True(entity.Has<Position>());
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void Add2()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add<Position>()
+            .Add<Velocity>();
+
+        Assert.True(entity.Has<Position>());
+        Assert.True(entity.Has<Velocity>());
+    }
+
+    [Fact]
+    private void AddEntity()
+    {
+        using World world = World.Create();
+
+        Entity tag = world.Entity();
+        Assert.True(tag != 0);
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add(tag);
+        Assert.True(entity.Has(tag));
+    }
+
+    [Fact]
+    private void AddChildOf()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity();
+        Assert.True(parent != 0);
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add(EcsChildOf, parent);
+        Assert.True(entity.Has(EcsChildOf, parent));
+    }
+
+    [Fact]
+    private void AddInstanceOf()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity();
+        Assert.True(@base != 0);
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add(EcsIsA, @base);
+        Assert.True(entity.Has(EcsIsA, @base));
+    }
+
+    [Fact]
+    private void Remove2()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add<Position>()
+            .Add<Velocity>();
+
+        Assert.True(entity.Has<Position>());
+        Assert.True(entity.Has<Velocity>());
+
+        entity.Remove<Position>()
+            .Remove<Velocity>();
+
+        Assert.True(!entity.Has<Position>());
+        Assert.True(!entity.Has<Velocity>());
+    }
+
+    [Fact]
+    private void Set2()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+        Assert.True(entity.Has<Position>());
+        Assert.True(entity.Has<Velocity>());
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Velocity* v = entity.GetPtr<Velocity>();
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+    }
+
+    [Fact]
+    private void RemoveEntity()
+    {
+        using World world = World.Create();
+
+        Entity tag = world.Entity();
+        Assert.True(tag != 0);
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add(tag);
+        Assert.True(entity.Has(tag));
+
+        entity.Remove(tag);
+        Assert.True(!entity.Has(tag));
+    }
+
+    [Fact]
+    private void RemoveChildOf()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity();
+        Assert.True(parent != 0);
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add(EcsChildOf, parent);
+        Assert.True(entity.Has(EcsChildOf, parent));
+
+        entity.Remove(EcsChildOf, parent);
+        Assert.True(!entity.Has(EcsChildOf, parent));
+    }
+
+    [Fact]
+    private void RemoveInstanceOf()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity();
+        Assert.True(@base != 0);
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        entity.Add(EcsIsA, @base);
+        Assert.True(entity.Has(EcsIsA, @base));
+
+        entity.Remove(EcsIsA, @base);
+        Assert.True(!entity.Has(EcsIsA, @base));
+    }
+
+    [Fact]
+    private void GetGeneric()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+
+        void* voidPointer = entity.GetPtr(position);
+        Assert.True(voidPointer != null);
+
+        Position* p = (Position*)voidPointer;
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+
+    [Fact]
+    private void EnsureGeneric()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+
+        bool invoked = false;
+
+        world.Observer<Position>()
+            .Event(Ecs.OnSet)
+            .Each((Entity e, ref Position p) => { invoked = true; });
+
+        void* voidPointer = entity.EnsurePtr(position);
+        Assert.True(voidPointer != null);
+
+        Position* p = (Position*)voidPointer;
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        entity.Modified(position);
+        Assert.True(invoked);
+    }
+
+    [Fact]
+    private void GetGenericWithId()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        Id id = position;
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+
+        void* voidPointer = entity.GetPtr(id);
+        Assert.True(voidPointer != null);
+
+        Position* p = (Position*)voidPointer;
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void GetGenericWithUlong()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        ulong id = position;
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+
+        void* voidPointer = entity.GetPtr(id);
+        Assert.True(voidPointer != null);
+
+        Position* p = (Position*)voidPointer;
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+
+    [Fact]
+    private void EnsureGenericWithId()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        Id id = position;
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+
+        bool invoked = false;
+
+        world.Observer<Position>()
+            .Event(Ecs.OnSet)
+            .Each((Entity e, ref Position p) => { invoked = true; });
+
+        void* voidPointer = entity.GetPtr(id);
+        Assert.True(voidPointer != null);
+
+        Position* p = (Position*)voidPointer;
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        entity.Modified(id);
+        Assert.True(invoked);
+    }
+
+    [Fact]
+    private void EnsureGenericWithUlong()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        ulong id = position;
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(entity != 0);
+        Assert.True(entity.Has<Position>());
+
+        bool invoked = false;
+
+        world.Observer<Position>()
+            .Event(Ecs.OnSet)
+            .Each((Entity e, ref Position p) => { invoked = true; });
+
+        void* voidPointer = entity.EnsurePtr(id);
+        Assert.True(voidPointer != null);
+
+        Position* p = (Position*)voidPointer;
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        entity.Modified(id);
+        Assert.True(invoked);
+    }
+
+    [Fact]
+    private void GetMutWithId()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        Position* p = (Position*)e.GetMutPtr(world.Id<Position>());
+        Assert.True(p == null);
+
+        e.Set(new Position(10, 20));
+
+        p = (Position*)e.GetMutPtr(world.Id<Position>());
+        Assert.True(p != null);
+
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void GetMutT()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        Position* p = e.GetMutPtr<Position>();
+        Assert.True(p == null);
+
+        e.Set(new Position(10, 20));
+
+        p = e.GetMutPtr<Position>();
+        Assert.True(p != null);
+
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void GetMutrt()
+    {
+        using World world = World.Create();
+
+        Entity tgt = world.Entity();
+        Entity e = world.Entity();
+
+        Position* p = (Position*)e.GetMutPtr(world.Id<Position>(), tgt);
+        Assert.True(p == null);
+
+        e.Set(tgt, new Position(10, 20));
+
+        p = (Position*)e.GetMutPtr(world.Id<Position>(), tgt);
+        Assert.True(p != null);
+
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void GetMutRt()
+    {
+        using World world = World.Create();
+
+        Entity tgt = world.Entity();
+        Entity e = world.Entity();
+
+        Position* p = e.GetMutPtr<Position>(tgt);
+        Assert.True(p == null);
+
+        e.Set(tgt, new Position(10, 20));
+
+        p = e.GetMutPtr<Position>(tgt);
+        Assert.True(p != null);
+
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void GetMutRT()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        Position* p = e.GetMutFirstPtr<Position, Tgt>();
+        Assert.True(p == null);
+
+        e.Set<Position, Tgt>(new Position(10, 20));
+
+        p = e.GetMutFirstPtr<Position, Tgt>();
+        Assert.True(p != null);
+
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void GetMutrT()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Entity e = world.Entity();
+
+        Position* p = e.GetMutSecondPtr<Position>(rel);
+        Assert.True(p == null);
+
+        e.SetSecond(rel, new Position(10, 20));
+
+        p = e.GetMutSecondPtr<Position>(rel);
+        Assert.True(p != null);
+
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void SetGeneric()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+
+        Position p = new Position(10, 20);
+
+        Entity e = world.Entity()
+            .SetUntyped(position, sizeof(Position), &p);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has(position));
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void SetGenericWithId()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        Id id = position;
+
+        Position p = new Position(10, 20);
+
+        Entity e = world.Entity()
+            .SetUntyped(id, sizeof(Position), &p);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has(id));
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void SetGenericWithUlong()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        ulong id = position;
+
+        Position p = new Position(10, 20);
+
+        Entity e = world.Entity()
+            .SetUntyped(id, sizeof(Position), &p);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has(id));
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void SetGenericNoSize()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+
+        Position p = new Position(10, 20);
+
+        Entity e = world.Entity()
+            .SetUntyped(position, &p);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has(position));
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void SetGenericNoSizeWithId()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        Id id = position;
+
+        Position p = new Position(10, 20);
+
+        Entity e = world.Entity()
+            .SetUntyped(id, &p);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has(id));
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void SetGenericNoSizeWithUlong()
+    {
+        using World world = World.Create();
+
+        Component<Position> position = world.Component<Position>();
+        ulong id = position;
+
+        Position p = new Position(10, 20);
+
+        Entity e = world.Entity()
+            .SetUntyped(id, &p);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has(id));
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void AddRole()
+    {
+        using World world = World.Create();
+
+        Entity entity = world.Entity();
+
+        entity = entity.AddFlags(ECS_PAIR);
+
+        Assert.True((entity & ECS_PAIR) != 0);
+    }
+
+    [Fact]
+    private void RemoveRole()
+    {
+        using World world = World.Create();
+
+        Entity entity = world.Entity();
+
+        ulong id = entity;
+
+        entity = entity.AddFlags(ECS_PAIR);
+
+        Assert.True((entity & ECS_PAIR) != 0);
+
+        entity = entity.RemoveFlags();
+
+        Assert.True(entity == id);
+    }
+
+    [Fact]
+    private void HasRole()
+    {
+        using World world = World.Create();
+
+        Entity entity = world.Entity();
+
+        entity = entity.AddFlags(ECS_PAIR);
+
+        Assert.True(entity.HasFlags(ECS_PAIR));
+
+        entity = entity.RemoveFlags();
+
+        Assert.True(!entity.HasFlags(ECS_PAIR));
+    }
+
+    [Fact]
+    private void PairRole()
+    {
+        using World world = World.Create();
+
+        Entity a = world.Entity();
+        Entity b = world.Entity();
+
+        Id pair = new Id(a, b);
+        pair = pair.AddFlags(ECS_PAIR);
+
+        Assert.True(pair.HasFlags(ECS_PAIR));
+
+        Entity rel = pair.First();
+        Entity obj = pair.Second();
+
+        Assert.True(rel == a);
+        Assert.True(obj == b);
+    }
+
+    [Fact]
+    private void EqualsTrue()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity();
+
+        Entity e12 = world.Entity(e1);
+        Entity e22 = world.Entity(e2);
+
+        Assert.True(e1 == e12);
+        Assert.True(e2 == e22);
+        Assert.True(e1 >= e12);
+        Assert.True(e1 <= e12);
+        Assert.True(e2 >= e22);
+        Assert.True(e2 <= e22);
+        Assert.True(e1 != e2);
+
+        Assert.True(!(e2 == e12));
+        Assert.True(!(e1 == e22));
+        Assert.True(!(e2 <= e12));
+        Assert.True(!(e1 >= e22));
+    }
+
+    [Fact]
+    private void Compare0()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity e0 = world.Entity(0);
+        Entity e02 = world.Entity(0);
+
+        Assert.True(e != e0);
+        Assert.True(e > e0);
+        Assert.True(e >= e0);
+        Assert.True(e0 < e);
+        Assert.True(e0 <= e);
+
+        Assert.True(e0 == e02);
+        Assert.True(e0 >= e02);
+        Assert.True(e0 <= e02);
+    }
+
+    [Fact]
+    private void CompareUlong()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity();
+
+        ulong id1 = e1;
+        ulong id2 = e2;
+
+        Assert.True(e1 == id1);
+        Assert.True(e2 == id2);
+
+        Assert.True(e1 != id2);
+        Assert.True(e2 != id1);
+
+        Assert.True(e1 >= id1);
+        Assert.True(e2 >= id2);
+
+        Assert.True(e1 <= id1);
+        Assert.True(e2 <= id2);
+
+        Assert.True(e1 <= id2);
+        Assert.True(e2 >= id1);
+
+        Assert.True(e1 < id2);
+        Assert.True(e2 > id1);
+
+
+        Assert.True(e2 != id1);
+        Assert.True(e1 != id2);
+
+        Assert.True(e2 == id2);
+        Assert.True(e1 == id1);
+
+        Assert.True(!(e1 >= id2));
+        Assert.True(!(e2 <= id1));
+
+        Assert.True(!(e2 < id2));
+        Assert.True(!(e1 > id1));
+    }
+
+    [Fact]
+    private void CompareId()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity();
+
+        Id id1 = e1;
+        Id id2 = e2;
+
+        Assert.True(e1 == id1);
+        Assert.True(e2 == id2);
+
+        Assert.True(e1 != id2);
+        Assert.True(e2 != id1);
+
+        Assert.True(e1 >= id1);
+        Assert.True(e2 >= id2);
+
+        Assert.True(e1 <= id1);
+        Assert.True(e2 <= id2);
+
+        Assert.True(e1 <= id2);
+        Assert.True(e2 >= id1);
+
+        Assert.True(e1 < id2);
+        Assert.True(e2 > id1);
+
+
+        Assert.True(e2 != id1);
+        Assert.True(e1 != id2);
+
+        Assert.True(e2 == id2);
+        Assert.True(e1 == id1);
+
+        Assert.True(!(e1 >= id2));
+        Assert.True(!(e2 <= id1));
+
+        Assert.True(!(e2 < id2));
+        Assert.True(!(e1 > id1));
+    }
+
+    [Fact]
+    private void CompareLiteral()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity(500);
+        Entity e2 = world.Entity(600);
+
+        Assert.True(e1 == 500);
+        Assert.True(e2 == 600);
+
+        Assert.True(e1 != 600);
+        Assert.True(e2 != 500);
+
+        Assert.True(e1 >= 500);
+        Assert.True(e2 >= 600);
+
+        Assert.True(e1 <= 500);
+        Assert.True(e2 <= 600);
+
+        Assert.True(e1 <= 600);
+        Assert.True(e2 >= 500);
+
+        Assert.True(e1 < 600);
+        Assert.True(e2 > 500);
+
+
+        Assert.True(e2 != 500);
+        Assert.True(e1 != 600);
+
+        Assert.True(e2 == 600);
+        Assert.True(e1 == 500);
+
+        Assert.True(!(e1 >= 600));
+        Assert.True(!(e2 <= 500));
+
+        Assert.True(!(e2 < 600));
+        Assert.True(!(e1 > 500));
+    }
+
+    [Fact]
+    private void GreaterThan()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity();
+
+        Assert.True(e2 > e1);
+        Assert.True(e2 >= e1);
+    }
+
+    [Fact]
+    private void LessThan()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity();
+
+        Assert.True(e1 < e2);
+        Assert.True(e1 <= e2);
+    }
+
+    [Fact]
+    private void Not0Or1()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        ulong id = e;
+
+        Assert.True(id != 0);
+        Assert.True(id != 1);
+    }
+
+    [Fact]
+    private void HasChildOf()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity();
+
+        Entity e = world.Entity()
+            .Add(EcsChildOf, parent);
+
+        Assert.True(e.Has(EcsChildOf, parent));
+    }
+
+    [Fact]
+    private void HasInstanceOf()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity();
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has(EcsIsA, @base));
+    }
+
+    [Fact]
+    private void HasInstanceOfIndirect()
+    {
+        using World world = World.Create();
+
+        Entity baseOfBase = world.Entity();
+
+        Entity @base = world.Entity()
+            .Add(EcsIsA, baseOfBase);
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has(EcsIsA, baseOfBase));
+    }
+
+    [Fact]
+    private void NullString()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        Assert.Equal("", e.Name());
+    }
+
+    [Fact]
+    private void SetName()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Assert.Equal("", e.Name());
+
+        e.SetName("Foo");
+        Assert.Equal("Foo", e.Name());
+    }
+
+    [Fact]
+    private void ChangeName()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity("Bar");
+        Assert.Equal("Bar", e.Name());
+
+        e.SetName("Foo");
+        Assert.Equal("Foo", e.Name());
+    }
+
+    [Fact]
+    private void Delete()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Add<Position>()
+            .Add<Velocity>();
+
+        e.Destruct();
+
+        Assert.True(!e.IsAlive());
+
+        Entity e2 = world.Entity();
+        Assert.True((uint)e2 == (uint)e);
+        Assert.True(e2 != e);
+    }
+
+    [Fact]
+    private void Clear()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Add<Position>()
+            .Add<Velocity>();
+
+        e.Clear();
+
+        Assert.True(!e.Has<Position>());
+        Assert.True(!e.Has<Velocity>());
+
+        Entity e2 = world.Entity();
+        Assert.True(e2 > e);
+    }
+
+    [Fact]
+    private void ForceOwned()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity prefab = world.Prefab()
+            .Add<Position>()
+            .Add<Velocity>()
+            .AutoOverride<Position>();
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, prefab);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Owns<Position>());
+        Assert.True(e.Has<Velocity>());
+        Assert.True(!e.Owns<Velocity>());
+    }
+
+    [Fact]
+    private void ForceOwned2()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity prefab = world.Prefab()
+            .Add<Position>()
+            .Add<Velocity>()
+            .AutoOverride<Position>()
+            .AutoOverride<Velocity>();
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, prefab);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Owns<Position>());
+        Assert.True(e.Has<Velocity>());
+        Assert.True(e.Owns<Velocity>());
+    }
+
+    [Fact]
+    private void ForceOwnedNested()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity prefab = world.Prefab()
+            .Add<Position>()
+            .Add<Velocity>()
+            .AutoOverride<Position>();
+
+        Entity prefab2 = world.Prefab()
+            .Add(EcsIsA, prefab);
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, prefab2);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Owns<Position>());
+        Assert.True(e.Has<Velocity>());
+        Assert.True(!e.Owns<Velocity>());
+    }
+
+    [Fact]
+    private void TagHasSizeZero()
+    {
+        using World world = World.Create();
+
+        Component<MyTag> comp = world.Component<MyTag>();
+
+        EcsComponent* ptr = comp.GetPtr<EcsComponent>();
+        Assert.Equal(0, ptr->size);
+        Assert.Equal(0, ptr->alignment);
+    }
+
+
+    [Fact]
+    private void GetTarget()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+
+        Entity obj1 = world.Entity()
+            .Add<Position>();
+
+        Entity obj2 = world.Entity()
+            .Add<Velocity>();
+
+        Entity obj3 = world.Entity()
+            .Add<Mass>();
+
+        Entity child = world.Entity()
+            .Add(rel, obj1)
+            .Add(rel, obj2)
+            .Add(rel, obj3);
+
+        Entity p = child.Target(rel);
+        Assert.True(p != 0);
+        Assert.True(p == obj1);
+
+        p = child.Target(rel);
+        Assert.True(p != 0);
+        Assert.True(p == obj1);
+
+        p = child.Target(rel, 1);
+        Assert.True(p != 0);
+        Assert.True(p == obj2);
+
+        p = child.Target(rel, 2);
+        Assert.True(p != 0);
+        Assert.True(p == obj3);
+
+        p = child.Target(rel, 3);
+        Assert.True(p == 0);
+    }
+
+    [Fact]
+    private void GetParent()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity();
+        Entity child = world.Entity().ChildOf(parent);
+
+        Assert.True(child.Target(EcsChildOf) == parent);
+        Assert.True(child.Parent() == parent);
+    }
+
+    [Fact]
+    private void IsComponentEnabled()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity e = world.Entity()
+            .Add<Position>();
+
+        Assert.True(e.Enabled<Position>());
+        Assert.True(!e.Enabled<Velocity>());
+    }
+
+    [Fact]
+    private void IsEnabledComponentEnabled()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity e = world.Entity()
+            .Add<Position>()
+            .Enable<Position>();
+
+        Assert.True(e.Enabled<Position>());
+    }
+
+    [Fact]
+    private void IsDisabledComponentEnabled()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity e = world.Entity()
+            .Add<Position>()
+            .Disable<Position>();
+
+        Assert.True(!e.Enabled<Position>());
+    }
+
+    [Fact]
+    private void IsPairEnabled()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity e = world.Entity()
+            .Add<Position, TgtA>();
+
+        Assert.True(e.Enabled<Position, TgtA>());
+        Assert.True(!e.Enabled<Position, TgtB>());
+    }
+
+    [Fact]
+    private void IsEnabledPairEnabled()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity e = world.Entity()
+            .Add<Position, Tgt>()
+            .Enable<Position, Tgt>();
+
+        Assert.True(e.Enabled<Position, Tgt>());
+    }
+
+    [Fact]
+    private void IsDisabledPairEnabled()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity e = world.Entity()
+            .Add<Position, Tgt>()
+            .Disable<Position, Tgt>();
+
+        Assert.True(!e.Enabled<Position, Tgt>());
+    }
+
+    [Fact]
+    private void IsPairEnabledWithIds()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity rel = world.Entity();
+        Entity tgtA = world.Entity();
+        Entity tgtB = world.Entity();
+
+        Entity e = world.Entity()
+            .Add(rel, tgtA);
+
+        Assert.True(e.Enabled(rel, tgtA));
+        Assert.True(!e.Enabled(rel, tgtB));
+    }
+
+    [Fact]
+    private void IsEnabledPairEnabledWithIds()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity().Add(Ecs.CanToggle);
+        Entity tgt = world.Entity();
+
+        Entity e = world.Entity()
+            .Add(rel, tgt)
+            .Enable(rel, tgt);
+
+        Assert.True(e.Enabled(rel, tgt));
+    }
+
+    [Fact]
+    private void IsDisabledPairEnabledWithIds()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity().Add(Ecs.CanToggle);
+        Entity tgt = world.Entity();
+
+        Entity e = world.Entity()
+            .Add(rel, tgt)
+            .Disable(rel, tgt);
+
+        Assert.True(!e.Enabled(rel, tgt));
+    }
+
+    [Fact]
+    private void IsPairEnabledWithTargetId()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity tgtA = world.Entity();
+        Entity tgtB = world.Entity();
+
+        Entity e = world.Entity()
+            .Add<Position>(tgtA);
+
+        Assert.True(e.Enabled<Position>(tgtA));
+        Assert.True(!e.Enabled<Position>(tgtB));
+    }
+
+    [Fact]
+    private void IsEnabledPairEnabledWithTargetId()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity tgt = world.Entity();
+
+        Entity e = world.Entity()
+            .Add<Position>(tgt)
+            .Enable<Position>(tgt);
+
+        Assert.True(e.Enabled<Position>(tgt));
+    }
+
+    [Fact]
+    private void IsDisabledPairEnabledWithTargetId()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.CanToggle);
+
+        Entity tgt = world.Entity();
+
+        Entity e = world.Entity()
+            .Add<Position>(tgt)
+            .Disable<Position>(tgt);
+
+        Assert.True(!e.Enabled<Position>(tgt));
+    }
+
+    [Fact]
+    private void GetTypes()
+    {
+        using World world = World.Create();
+
+        Entity entity = world.Entity();
+        Assert.True(entity != 0);
+
+        FlecsType type1 = entity.Type();
+        Assert.Equal(0, type1.Count());
+
+        FlecsType type2 = entity.Type();
+        Assert.Equal(0, type2.Count());
+    }
+
+    [Fact]
+    private void GetNonEmptyType()
+    {
+        using World world = World.Create();
+
+        Entity entity = world.Entity()
+            .Add<Position>();
+        Assert.True(entity != 0);
+
+        FlecsType type1 = entity.Type();
+        Assert.Equal(1, type1.Count());
+        Assert.Equal(type1.Get(0), world.Id<Position>());
+
+        FlecsType type2 = entity.Type();
+        Assert.Equal(1, type2.Count());
+        Assert.Equal(type2.Get(0), world.Id<Position>());
+    }
+
+    [Fact]
+    private void SetDeduced()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Position(10, 20));
+
+        Assert.True(e.Has<Position>());
+
+        Position* p = e.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void Override()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .AutoOverride<Position>();
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Owns<Position>());
+    }
+
+    [Fact]
+    private void OverrideId()
+    {
+        using World world = World.Create();
+
+        Entity tagA = world.Entity().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        Entity tagB = world.Entity().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .AutoOverride(tagA)
+            .Add(tagB);
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has(tagA));
+        Assert.True(e.Owns(tagA));
+
+        Assert.True(e.Has(tagB));
+        Assert.True(!e.Owns(tagB));
+    }
+
+    [Fact]
+    private void OverridePairWithTargetId()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        Entity tgtA = world.Entity();
+        Entity tgtB = world.Entity();
+
+        Entity @base = world.Entity()
+            .AutoOverride<Position>(tgtA)
+            .Add<Position>(tgtB);
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Position>(tgtA));
+        Assert.True(e.Owns<Position>(tgtA));
+
+        Assert.True(e.Has<Position>(tgtB));
+        Assert.True(!e.Owns<Position>(tgtB));
+    }
+
+    [Fact]
+    private void OverridePairWithIds()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        Entity tgtA = world.Entity();
+        Entity tgtB = world.Entity();
+
+        Entity @base = world.Entity()
+            .AutoOverride(rel, tgtA)
+            .Add(rel, tgtB);
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has(rel, tgtA));
+        Assert.True(e.Owns(rel, tgtA));
+
+        Assert.True(e.Has(rel, tgtB));
+        Assert.True(!e.Owns(rel, tgtB));
+    }
+
+    [Fact]
+    private void OverridePair()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .AutoOverride<Position, Tag0>()
+            .Add<Position, Tag1>();
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Position, Tag0>());
+        Assert.True(e.Owns<Position, Tag0>());
+
+        Assert.True(e.Has<Position, Tag1>());
+        Assert.True(!e.Owns<Position, Tag1>());
+    }
+
+    [Fact]
+    private void SetOverride()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .SetAutoOverride(new Position(10, 20));
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Owns<Position>());
+
+        Position* p = e.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Position* pBase = @base.GetPtr<Position>();
+        Assert.True(p != pBase);
+        Assert.Equal(10, pBase->X);
+        Assert.Equal(20, pBase->Y);
+    }
+
+    [Fact]
+    private void SetOverrideLValue()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Position plvalue = new Position(10, 20);
+
+        Entity @base = world.Entity()
+            .SetAutoOverride(plvalue);
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Owns<Position>());
+
+        Position* p = e.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Position* pBase = @base.GetPtr<Position>();
+        Assert.True(p != pBase);
+        Assert.Equal(10, pBase->X);
+        Assert.Equal(20, pBase->Y);
+    }
+
+    [Fact]
+    private void SetOverridePair()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .SetAutoOverride<Position, Tgt>(new Position(10, 20));
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Position, Tgt>());
+        Assert.True(e.Owns<Position, Tgt>());
+
+        Position* p = e.GetFirstPtr<Position, Tgt>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Position* pBase = @base.GetFirstPtr<Position, Tgt>();
+        Assert.True(p != pBase);
+        Assert.Equal(10, pBase->X);
+        Assert.Equal(20, pBase->Y);
+    }
+
+    [Fact]
+    private void SetOverridePairWithTargetId()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity tgt = world.Entity();
+
+        Entity @base = world.Entity()
+            .SetAutoOverride(tgt, new Position(10, 20));
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Position>(tgt));
+        Assert.True(e.Owns<Position>(tgt));
+
+        Position* p = e.GetPtr<Position>(tgt);
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Position* pBase = @base.GetPtr<Position>(tgt);
+        Assert.True(p != pBase);
+        Assert.Equal(10, pBase->X);
+        Assert.Equal(20, pBase->Y);
+    }
+
+    [Fact]
+    private void SetOverridePairWithRelTag()
+    {
+        using World world = World.Create();
+
+        world.Component<Tgt>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .SetAutoOverride<Tgt, Position>(new Position(10, 20));
+
+        Entity e = world.Entity()
+            .Add(EcsIsA, @base);
+
+        Assert.True(e.Has<Tgt, Position>());
+        Assert.True(e.Owns<Tgt, Position>());
+
+        Position* p = e.GetSecondPtr<Tgt, Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Position* pBase = @base.GetSecondPtr<Tgt, Position>();
+        Assert.True(p != pBase);
+        Assert.Equal(10, pBase->X);
+        Assert.Equal(20, pBase->Y);
+    }
+
+    [Fact]
+    private void ImplicitNameToChar()
+    {
+        using World world = World.Create();
+
+        Entity entity = new Entity(world, "Foo");
+        Assert.True(entity != 0);
+        Assert.Equal("Foo", entity.Name());
+
+        Assert.Equal("Foo", entity.Name());
+    }
+
+    [Fact]
+    private void Path()
+    {
+        using World world = World.Create();
+        Entity parent = world.Entity("parent");
+
+        using ScopedWorld scope = world.Scope(parent);
+        Entity child = world.Entity("child");
+        Assert.Equal(".parent.child", child.Path());
+    }
+
+    [Fact]
+    private void PathFrom()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity("parent");
+
+        using ScopedWorld parentScope = world.Scope(parent);
+        Entity child = world.Entity("child");
+
+        using ScopedWorld childScope = world.Scope(child);
+        Entity grandchild = world.Entity("grandchild");
+
+        Assert.Equal(".parent.child.grandchild", grandchild.Path());
+        Assert.Equal("child.grandchild", grandchild.PathFrom(parent));
+    }
+
+    [Fact]
+    private void PathFromType()
+    {
+        using World world = World.Create();
+        Entity parent = world.Entity<Parent>();
+
+        using ScopedWorld parentScope = world.Scope(parent);
+        Entity child = world.Entity("child");
+
+        using ScopedWorld childScope = world.Scope(child);
+        Entity grandchild = world.Entity("grandchild");
+
+        Assert.Equal(".Parent.child.grandchild", grandchild.Path());
+        Assert.Equal("child.grandchild", grandchild.PathFrom<Parent>());
+    }
+
+    [Fact]
+    private void PathCustomSep()
+    {
+        using World world = World.Create();
+        Entity parent = world.Entity("parent");
+
+        using ScopedWorld parentScope = world.Scope(parent);
+        Entity child = world.Entity("child");
+
+        Assert.Equal("parent_child", child.Path("_", ""));
+    }
+
+    [Fact]
+    private void PathFromCustomSep()
+    {
+        using World world = World.Create();
+        Entity parent = world.Entity("parent");
+
+        using ScopedWorld parentScope = world.Scope(parent);
+        Entity child = world.Entity("child");
+
+        using ScopedWorld childScope = world.Scope(child);
+        Entity grandchild = world.Entity("grandchild");
+
+        Assert.Equal(".parent.child.grandchild", grandchild.Path());
+        Assert.Equal("child_grandchild", grandchild.PathFrom(parent, "_"));
+    }
+
+    [Fact]
+    private void PathFromTypeCustomSep()
+    {
+        using World world = World.Create();
+        Entity parent = world.Entity<Parent>();
+
+        using ScopedWorld parentScope = world.Scope(parent);
+        Entity child = world.Entity("child");
+
+        using ScopedWorld childScope = world.Scope(child);
+        Entity grandchild = world.Entity("grandchild");
+
+        Assert.Equal(".Parent.child.grandchild", grandchild.Path());
+        Assert.Equal("child_grandchild", grandchild.PathFrom<Parent>("_"));
+    }
+
+    [Fact]
+    private void ImplicitPathToChar()
+    {
+        using World world = World.Create();
+
+        Entity entity = new Entity(world, "Foo.Bar");
+        Assert.True(entity != 0);
+        Assert.Equal("Bar", entity.Name());
+
+        Assert.Equal(".Foo.Bar", entity.Path());
+    }
+
+    [Fact]
+    private void ImplicitTypeStringToChar()
+    {
+        using World world = World.Create();
+
+        Entity entity = new Entity(world, "Foo");
+        Assert.True(entity != 0);
+
+        Assert.Equal("(Identifier,Name)", entity.Type().Str());
+    }
+
+    [Fact]
+    private void SetTemplate()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Template<int> { X = 10, Y = 20 });
+
+        Template<int>* ptr = e.GetPtr<Template<int>>();
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void Get1ComponentWithCallback()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(11, 22));
+
+        Entity e3 = world.Entity()
+            .Set(new Velocity(1, 2));
+
+        Assert.True(e1.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+        }));
+
+        Assert.True(e2.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(11, p.X);
+            Assert.Equal(22, p.Y);
+        }));
+
+        Assert.False(e3.Read((ref readonly Position p) => { }));
+    }
+
+    [Fact]
+    private void Get2ComponentWithCallback()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(11, 22));
+
+        Entity e3 = world.Entity()
+            .Set(new Velocity(1, 2));
+
+        Assert.True(e1.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+        }));
+
+        Assert.False(e2.Read((ref readonly Position p, ref readonly Velocity v) => { }));
+
+        Assert.False(e3.Read((ref readonly Position p, ref readonly Velocity v) => { }));
+    }
+
+    [Fact]
+    private void Ensure1ComponentWithCallback()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(11, 22));
+
+        Entity e3 = world.Entity()
+            .Set(new Velocity(1, 2));
+
+        Assert.True(e1.Write((ref Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+            p.X++;
+            p.Y += 2;
+        }));
+
+        Assert.True(e2.Write((ref Position p) =>
+        {
+            Assert.Equal(11, p.X);
+            Assert.Equal(22, p.Y);
+            p.X++;
+            p.Y += 2;
+        }));
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        p = e2.GetPtr<Position>();
+        Assert.Equal(12, p->X);
+        Assert.Equal(24, p->Y);
+
+        Assert.False(e3.Read((ref readonly Position _) => { }));
+    }
+
+    [Fact]
+    private void Ensure2ComponentWithCallback()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(11, 22));
+
+        Entity e3 = world.Entity()
+            .Set(new Velocity(1, 2));
+
+        Assert.True(e1.Write((ref Position p, ref Velocity v) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+
+            p.X++;
+            p.Y += 2;
+            v.X += 3;
+            v.Y += 4;
+        }));
+
+        Assert.False(e2.Read((ref readonly Position p, ref readonly Velocity v) => { }));
+
+        Assert.False(e3.Read((ref readonly Position p, ref readonly Velocity v) => { }));
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        Velocity* v = e1.GetPtr<Velocity>();
+        Assert.Equal(4, v->X);
+        Assert.Equal(6, v->Y);
+    }
+
+    [Fact]
+    private void GetComponentWithCallbackNested()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Assert.True(e.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.True(e.Read((ref readonly Velocity v) =>
+            {
+                Assert.Equal(1, v.X);
+                Assert.Equal(2, v.Y);
+            }));
+        }));
+    }
+
+    [Fact]
+    private void Set1ComponentWithCallback()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p) =>
+            {
+                p.X = 10;
+                p.Y = 20;
+            });
+
+        Assert.True(e.Has<Position>());
+
+        Position* p = e.GetPtr<Position>();
+        Assert.True(p != null);
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void Set2ComponentsWithCallback()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p, ref Velocity v) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+            });
+
+        Assert.True(e.Has<Position>());
+
+        Position* p = e.GetPtr<Position>();
+        Assert.True(p != null);
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Velocity* v = e.GetPtr<Velocity>();
+        Assert.True(v != null);
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+    }
+
+    [Fact]
+    private void Set3ComponentsWithCallback()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p, ref Velocity v, ref Mass m) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+                m = new Mass(50);
+            });
+
+        Assert.True(e.Has<Position>());
+
+        Position* p = e.GetPtr<Position>();
+        Assert.True(p != null);
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Velocity* v = e.GetPtr<Velocity>();
+        Assert.True(v != null);
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+
+        Mass* m = e.GetPtr<Mass>();
+        Assert.True(m != null);
+        Assert.Equal(50, m->Value);
+    }
+
+    [Fact]
+    private void DeferSet1Component()
+    {
+        using World world = World.Create();
+
+        world.DeferBegin();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p) =>
+            {
+                p.X = 10;
+                p.Y = 20;
+            });
+
+        Assert.True(!e.Has<Position>());
+
+        world.DeferEnd();
+
+        Assert.True(e.Has<Position>());
+
+        e.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+        });
+    }
+
+    [Fact]
+    private void DeferSet2Components()
+    {
+        using World world = World.Create();
+
+        world.DeferBegin();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p, ref Velocity v) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+            });
+
+        Assert.True(!e.Has<Position>());
+        Assert.True(!e.Has<Velocity>());
+
+        world.DeferEnd();
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+
+        e.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+        });
+    }
+
+    [Fact]
+    private void DeferSet3Components()
+    {
+        using World world = World.Create();
+
+        world.DeferBegin();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p, ref Velocity v, ref Mass m) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+                m = new Mass(50);
+            });
+
+        Assert.True(!e.Has<Position>());
+        Assert.True(!e.Has<Velocity>());
+        Assert.True(!e.Has<Mass>());
+
+        world.DeferEnd();
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+        Assert.True(e.Has<Mass>());
+
+        e.Read((ref readonly Position p, ref readonly Velocity v, ref readonly Mass m) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+
+            Assert.Equal(50, m.Value);
+        });
+    }
+
+    [Fact]
+    private void Set2WithOnSet()
+    {
+        using World world = World.Create();
+
+        int positionSet = 0;
+        int velocitySet = 0;
+
+        world.Observer<Position>()
+            .Event(Ecs.OnSet)
+            .Each((Entity e, ref Position p) =>
+            {
+                positionSet++;
+                Assert.Equal(10, p.X);
+                Assert.Equal(20, p.Y);
+            });
+
+        world.Observer<Velocity>()
+            .Event(Ecs.OnSet)
+            .Each((Entity e, ref Velocity v) =>
+            {
+                velocitySet++;
+                Assert.Equal(1, v.X);
+                Assert.Equal(2, v.Y);
+            });
+
+        Entity e = world.Entity()
+            .Insert((ref Position p, ref Velocity v) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+            });
+
+        Assert.Equal(1, positionSet);
+        Assert.Equal(1, velocitySet);
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+        }));
+    }
+
+    [Fact]
+    private void DeferSet2WithOnSet()
+    {
+        using World world = World.Create();
+
+        int positionSet = 0;
+        int velocitySet = 0;
+
+        world.Observer<Position>()
+            .Event(Ecs.OnSet)
+            .Each((Entity e, ref Position p) =>
+            {
+                positionSet++;
+                Assert.Equal(10, p.X);
+                Assert.Equal(20, p.Y);
+            });
+
+        world.Observer<Velocity>()
+            .Event(Ecs.OnSet)
+            .Each((Entity e, ref Velocity v) =>
+            {
+                velocitySet++;
+                Assert.Equal(1, v.X);
+                Assert.Equal(2, v.Y);
+            });
+
+        world.DeferBegin();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p, ref Velocity v) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+            });
+
+        Assert.Equal(0, positionSet);
+        Assert.Equal(0, velocitySet);
+
+        world.DeferEnd();
+
+        Assert.Equal(1, positionSet);
+        Assert.Equal(1, velocitySet);
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+        }));
+    }
+
+    [Fact]
+    private void Set2AfterFluent()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Mass(50))
+            .Insert((ref Position p, ref Velocity v) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+            });
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+        Assert.True(e.Has<Mass>());
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v, ref readonly Mass m) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+
+            Assert.Equal(50, m.Value);
+        }));
+    }
+
+    [Fact]
+    private void Set2BeforeFluent()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Insert((ref Position p, ref Velocity v) =>
+            {
+                p = new Position(10, 20);
+                v = new Velocity(1, 2);
+            })
+            .Set(new Mass(50));
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+        Assert.True(e.Has<Mass>());
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v, ref readonly Mass m) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+
+            Assert.Equal(50, m.Value);
+        }));
+    }
+
+    [Fact]
+    private void Set2AfterSet1()
+    {
+        using World world = World.Create();
+
+        int called = 0;
+
+        Entity e = world.Entity().Set(new Position(5, 10));
+        Assert.True(e.Has<Position>());
+
+        Assert.True(e.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(5, p.X);
+            Assert.Equal(10, p.Y);
+        }));
+
+        e.Insert((ref Position p, ref Velocity v) =>
+        {
+            p = new Position(10, 20);
+            v = new Velocity(1, 2);
+        });
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+
+            called++;
+        }));
+
+        Assert.Equal(1, called);
+    }
+
+    [Fact]
+    private void Set2AfterSet2()
+    {
+        using World world = World.Create();
+
+        int called = 0;
+
+        Entity e = world.Entity()
+            .Set(new Position(5, 10))
+            .Set(new Velocity(1, 2));
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(5, p.X);
+            Assert.Equal(10, p.Y);
+
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+
+            called++;
+        }));
+
+        Assert.Equal(1, called);
+
+        e.Insert((ref Position p, ref Velocity v) =>
+        {
+            p = new Position(10, 20);
+            v = new Velocity(3, 4);
+        });
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(3, v.X);
+            Assert.Equal(4, v.Y);
+
+            called++;
+        }));
+
+        Assert.Equal(2, called);
+    }
+
+    [Fact]
+    private void WithSelf()
+    {
+        using World world = World.Create();
+
+        Entity tag = world.Entity().With(() =>
+        {
+            Entity e1 = world.Entity();
+            e1.Set(new Self { Value = e1 });
+            Entity e2 = world.Entity();
+            e2.Set(new Self { Value = e2 });
+            Entity e3 = world.Entity();
+            e3.Set(new Self { Value = e3 });
+        });
+
+        Component<Self> self = world.Component<Self>();
+        Assert.True(!self.Has(tag));
+
+        int count = 0;
+        using Query query = world.QueryBuilder()
+            .With(tag)
+            .Build();
+
+        query.Each((Entity e) =>
+        {
+            Assert.True(e.Has(tag));
+
+            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
+
+            count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void WithRelationTypeSelf()
+    {
+        using World world = World.Create();
+
+        Entity bob = world.Entity().With<Likes>(() =>
+        {
+            Entity e1 = world.Entity();
+            e1.Set(new Self(e1));
+            Entity e2 = world.Entity();
+            e2.Set(new Self(e2));
+            Entity e3 = world.Entity();
+            e3.Set(new Self(e3));
+        });
+
+        Component<Self> self = world.Component<Self>();
+        Assert.True(!self.Has<Likes>(bob));
+
+        int count = 0;
+        using Query q = world.QueryBuilder()
+            .With<Likes>(bob)
+            .Build();
+
+        q.Each((Entity e) =>
+        {
+            Assert.True(e.Has<Likes>(bob));
+
+            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
+
+            count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void WithRelationSelf()
+    {
+        using World world = World.Create();
+
+        Entity likes = world.Entity();
+
+        Entity bob = world.Entity().With(likes, () =>
+        {
+            Entity e1 = world.Entity();
+            e1.Set(new Self(e1));
+            Entity e2 = world.Entity();
+            e2.Set(new Self(e2));
+            Entity e3 = world.Entity();
+            e3.Set(new Self(e3));
+        });
+
+        Component<Self> self = world.Component<Self>();
+        Assert.True(!self.Has(likes, bob));
+
+        int count = 0;
+        using Query q = world.QueryBuilder()
+            .With(likes, bob)
+            .Build();
+
+        q.Each((Entity e) =>
+        {
+            Assert.True(e.Has(likes, bob));
+
+            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
+
+            count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void WithSelfWithName()
+    {
+        using World world = World.Create();
+
+        Entity tier1 = world.Entity("Tier1").With(() =>
+        {
+            Entity tier2 = world.Entity("Tier2");
+            tier2.Set(new Self(tier2));
+        });
+
+        Entity tier2 = world.Lookup("Tier2");
+        Assert.True(tier2 != 0);
+
+        Assert.True(tier2.Has(tier1));
+    }
+
+    [Fact]
+    private void WithSelfNested()
+    {
+        using World world = World.Create();
+
+        Entity tier1 = world.Entity("Tier1").With(() =>
+        {
+            world.Entity("Tier2").With(() => { world.Entity("Tier3"); });
+        });
+
+        Entity tier2 = world.Lookup("Tier2");
+        Assert.True(tier2 != 0);
+
+        Entity tier3 = world.Lookup("Tier3");
+        Assert.True(tier3 != 0);
+
+        Assert.True(tier2.Has(tier1));
+        Assert.True(tier3.Has(tier2));
+    }
+
+    [Fact]
+    private void WithScope()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity("P").Scope(() =>
+        {
+            Entity e1 = world.Entity("C1");
+            e1.Set(new Self(e1));
+            Entity e2 = world.Entity("C2");
+            e2.Set(new Self(e2));
+            Entity e3 = world.Entity("C3");
+            e3.Set(new Self(e3));
+
+            Assert.True(world.Lookup("C1") == e1);
+            Assert.True(world.Lookup("C2") == e2);
+            Assert.True(world.Lookup("C3") == e3);
+
+            Assert.True(world.Lookup(".P.C1") == e1);
+            Assert.True(world.Lookup(".P.C2") == e2);
+            Assert.True(world.Lookup(".P.C3") == e3);
+        });
+
+        Assert.True(world.Lookup("C1") == 0);
+        Assert.True(world.Lookup("C2") == 0);
+        Assert.True(world.Lookup("C3") == 0);
+
+        Assert.True(parent.Lookup("C1") != 0);
+        Assert.True(parent.Lookup("C2") != 0);
+        Assert.True(parent.Lookup("C3") != 0);
+
+        Assert.True(world.Lookup("P.C1") == parent.Lookup("C1"));
+        Assert.True(world.Lookup("P.C2") == parent.Lookup("C2"));
+        Assert.True(world.Lookup("P.C3") == parent.Lookup("C3"));
+
+        Component<Self> self = world.Component<Self>();
+        Assert.True(!self.Has(Ecs.ChildOf, parent));
+
+        int count = 0;
+        using Query q = world.QueryBuilder()
+            .With(Ecs.ChildOf, parent)
+            .Build();
+
+        q.Each((Entity e) =>
+        {
+            Assert.True(e.Has(Ecs.ChildOf, parent));
+
+            Assert.True(e.Read((ref readonly Self s) => { Assert.True(s.Value == e); }));
+
+            count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void WithScopeNested()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity("P").Scope(() =>
+        {
+            Entity child = world.Entity("C").Scope(() =>
+            {
+                Entity gchild = world.Entity("GC");
+                Assert.True(gchild == world.Lookup("GC"));
+                Assert.True(gchild == world.Lookup(".P.C.GC"));
+            });
+
+            Assert.True(world.Lookup("C") == child);
+            Assert.True(world.Lookup(".P.C") == child);
+            Assert.True(world.Lookup(".P.C.GC") != 0);
+        });
+
+        Assert.True(0 == world.Lookup("C"));
+        Assert.True(0 == world.Lookup("GC"));
+        Assert.True(0 == world.Lookup("C.GC"));
+
+        Entity child = world.Lookup("P.C");
+        Assert.True(0 != child);
+        Assert.True(child.Has(Ecs.ChildOf, parent));
+
+        Entity gchild = world.Lookup("P.C.GC");
+        Assert.True(0 != gchild);
+        Assert.True(gchild.Has(Ecs.ChildOf, child));
+    }
+
+    [Fact]
+    private void WithScopeNestedSameNameAsParent()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity("P").Scope(() =>
+        {
+            Entity child = world.Entity("C").Scope(() =>
+            {
+                Entity gchild = world.Entity("C");
+                Assert.True(gchild == world.Lookup("C"));
+                Assert.True(gchild == world.Lookup(".P.C.C"));
+            });
+
+            Assert.True(world.Lookup("C") == child);
+            Assert.True(world.Lookup(".P.C") == child);
+            Assert.True(world.Lookup(".P.C.C") != 0);
+        });
+
+        Assert.True(0 == world.Lookup("C"));
+        Assert.True(0 == world.Lookup("C"));
+        Assert.True(0 == world.Lookup("C.C"));
+
+        Entity child = world.Lookup("P.C");
+        Assert.True(0 != child);
+        Assert.True(child.Has(Ecs.ChildOf, parent));
+
+        Entity gchild = world.Lookup("P.C.C");
+        Assert.True(0 != gchild);
+        Assert.True(gchild.Has(Ecs.ChildOf, child));
+    }
+
+    [Fact]
+    private void NoRecursiveLookup()
+    {
+        using World world = World.Create();
+
+        Entity p = world.Entity("P");
+        Entity c = world.Entity("C").ChildOf(p);
+        Entity gc = world.Entity("GC").ChildOf(c);
+
+        Assert.True(c.Lookup("GC") == gc);
+        Assert.True(c.Lookup("C") == 0);
+        Assert.True(c.Lookup("P") == 0);
+    }
+
+    [Fact]
+    private void DeferNewWithName()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+
+        world.Defer(() =>
+        {
+            e = world.Entity("Foo");
+            Assert.True(e != 0);
+        });
+
+        Assert.True(e.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Foo", e.Name());
+    }
+
+    [Fact]
+    private void DeferNewWithNestedName()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+
+        world.Defer(() =>
+        {
+            e = world.Entity("Foo.Bar");
+            Assert.True(e != 0);
+        });
+
+        Assert.True(e.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Bar", e.Name());
+        Assert.Equal(".Foo.Bar", e.Path());
+    }
+
+
+    [Fact]
+    private void DeferNewWithScopeName()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+        Entity parent = world.Entity("Parent");
+
+        world.Defer(() =>
+        {
+            parent.Scope(() =>
+            {
+                e = world.Entity("Foo");
+                Assert.True(e != 0);
+            });
+        });
+
+        Assert.True(e.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Foo", e.Name());
+        Assert.Equal(".Parent.Foo", e.Path());
+    }
+
+    [Fact]
+    private void DeferNewWithScopeNestedName()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+        Entity parent = world.Entity("Parent");
+
+        world.Defer(() =>
+        {
+            parent.Scope(() =>
+            {
+                e = world.Entity("Foo.Bar");
+                Assert.True(e != 0);
+            });
+        });
+
+        Assert.True(e.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Bar", e.Name());
+        Assert.Equal(".Parent.Foo.Bar", e.Path());
+    }
+
+    [Fact]
+    private void DeferNewWithDeferredScopeNestedName()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+        Entity parent = default;
+
+        world.Defer(() =>
+        {
+            parent = world.Entity("Parent").Scope(() =>
+            {
+                e = world.Entity("Foo.Bar");
+                Assert.True(e != 0);
+            });
+        });
+
+        Assert.True(parent.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Parent", parent.Name());
+        Assert.Equal(".Parent", parent.Path());
+
+        Assert.True(e.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Bar", e.Name());
+        Assert.Equal(".Parent.Foo.Bar", e.Path());
+    }
+
+    [Fact]
+    private void DeferNewWithScope()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+        Entity parent = world.Entity();
+
+        world.Defer(() =>
+        {
+            parent.Scope(() =>
+            {
+                e = world.Entity();
+                Assert.True(e != 0);
+            });
+        });
+
+        Assert.True(e.Has(EcsChildOf, parent));
+    }
+
+    [Fact]
+    private void DeferNewWithWith()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+        Entity tag = world.Entity();
+
+        world.Defer(() =>
+        {
+            tag.With(() =>
+            {
+                e = world.Entity();
+                Assert.True(e != 0);
+                Assert.True(!e.Has(tag));
+            });
+        });
+
+        Assert.True(e.Has(tag));
+    }
+
+    [Fact]
+    private void DeferNewWithNameScopeWith()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+        Entity tag = world.Entity();
+        Entity parent = world.Entity("Parent");
+
+        world.Defer(() =>
+        {
+            tag.With(() =>
+            {
+                parent.Scope(() =>
+                {
+                    e = world.Entity("Foo");
+                    Assert.True(e != 0);
+                    Assert.True(!e.Has(tag));
+                });
+                Assert.True(!e.Has(tag));
+            });
+            Assert.True(!e.Has(tag));
+        });
+
+        Assert.True(e.Has(tag));
+        Assert.True(e.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Foo", e.Name());
+        Assert.Equal(".Parent.Foo", e.Path());
+    }
+
+    [Fact]
+    private void DeferNewWithNestedNameScopeWith()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+        Entity tag = world.Entity();
+        Entity parent = world.Entity("Parent");
+
+        world.Defer(() =>
+        {
+            tag.With(() =>
+            {
+                parent.Scope(() =>
+                {
+                    e = world.Entity("Foo.Bar");
+                    Assert.True(e != 0);
+                    Assert.True(!e.Has(tag));
+                });
+                Assert.True(!e.Has(tag));
+            });
+            Assert.True(!e.Has(tag));
+        });
+
+        Assert.True(e.Has(tag));
+        Assert.True(e.Has<EcsIdentifier>(EcsName));
+        Assert.Equal("Bar", e.Name());
+        Assert.Equal(".Parent.Foo.Bar", e.Path());
+    }
+
+    [Fact]
+    private void DeferWithWithImplicitComponent()
+    {
+        using World world = World.Create();
+
+        Entity e = default;
+
+        world.Defer(() =>
+        {
+            world.With<Tag>(() =>
+            {
+                e = world.Entity();
+                Assert.True(!e.Has<Tag>());
+            });
+            Assert.True(!e.Has<Tag>());
+        });
+
+        Assert.True(e.Has<Tag>());
+    }
+
+    [Fact]
+    private void DeferSuspendResume()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        world.Defer(() =>
+        {
+            e.Add<Tag0>();
+            Assert.True(!e.Has<Tag0>());
+
+            world.DeferSuspend();
+            e.Add<Tag1>();
+            Assert.True(!e.Has<Tag0>());
+            Assert.True(e.Has<Tag1>());
+            world.DeferResume();
+
+            Assert.True(!e.Has<Tag0>());
+            Assert.True(e.Has<Tag1>());
+        });
+
+        Assert.True(e.Has<Tag0>());
+        Assert.True(e.Has<Tag1>());
+    }
+
+    [Fact]
+    private void DeferEnsure()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        world.DeferBegin();
+        Position* p = e.EnsurePtr<Position>();
+        p->X = 10;
+        p->Y = 20;
+        world.DeferEnd();
+
+        p = e.GetMutPtr<Position>();
+        Assert.True(p != null);
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+    }
+
+    [Fact]
+    private void WithAfterBuilderMethod()
+    {
+        using World world = World.Create();
+
+        Entity a = world.Entity()
+            .Set(new Position(10, 20))
+            .With(() => { world.Entity("X"); });
+
+        Entity b = world.Entity().Set(new Position(30, 40))
+            .With<Likes>(() => { world.Entity("Y"); });
+
+        Entity c = world.Entity().Set(new Position(50, 60))
+            .With(EcsIsA, () => { world.Entity("Z"); });
+
+        Assert.True(a.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+        }));
+
+        Assert.True(b.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(30, p.X);
+            Assert.Equal(40, p.Y);
+        }));
+
+        Assert.True(c.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(50, p.X);
+            Assert.Equal(60, p.Y);
+        }));
+
+        Entity x = world.Lookup("X");
+        Assert.True(x != 0);
+        Assert.True(x.Has(a));
+
+        Entity y = world.Lookup("Y");
+        Assert.True(y != 0);
+        Assert.True(y.Has<Likes>(b));
+
+        Entity z = world.Lookup("Z");
+        Assert.True(z != 0);
+        Assert.True(z.Has(EcsIsA, c));
+    }
+
+    [Fact]
+    private void WithBeforeBuilderMethod()
+    {
+        using World world = World.Create();
+
+        Entity a = world.Entity()
+            .With(() => { world.Entity("X"); })
+            .Set(new Position(10, 20));
+
+        Entity b = world.Entity()
+            .With<Likes>(() => { world.Entity("Y"); })
+            .Set(new Position(30, 40));
+
+        Entity c = world.Entity()
+            .With(EcsIsA, () => { world.Entity("Z"); })
+            .Set(new Position(50, 60));
+
+        Assert.True(a.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+        }));
+
+        Assert.True(b.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(30, p.X);
+            Assert.Equal(40, p.Y);
+        }));
+
+        Assert.True(c.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(50, p.X);
+            Assert.Equal(60, p.Y);
+        }));
+
+        Entity x = world.Lookup("X");
+        Assert.True(x != 0);
+        Assert.True(x.Has(a));
+
+        Entity y = world.Lookup("Y");
+        Assert.True(y != 0);
+        Assert.True(y.Has<Likes>(b));
+
+        Entity z = world.Lookup("Z");
+        Assert.True(z != 0);
+        Assert.True(z.Has(EcsIsA, c));
+    }
+
+    [Fact]
+    private void ScopeAfterBuilderMethod()
+    {
+        using World world = World.Create();
+
+        world.Entity("P")
+            .Set(new Position(10, 20))
+            .Scope(() => { world.Entity("C"); });
+
+        Entity c = world.Lookup("P.C");
+        Assert.True(c != 0);
+    }
+
+    [Fact]
+    private void ScopeBeforeBuilderMethod()
+    {
+        using World world = World.Create();
+
+        world.Entity("P")
+            .Scope(() => { world.Entity("C"); })
+            .Set(new Position(10, 20));
+
+        Entity c = world.Lookup("P.C");
+        Assert.True(c != 0);
+    }
+
+
+    [Fact]
+    private void EntityIdStr()
+    {
+        using World world = World.Create();
+
+        Id id = world.Entity("Foo");
+
+        Assert.Equal("Foo", id.Str());
+    }
+
+    [Fact]
+    private void PairIdStr()
+    {
+        using World world = World.Create();
+
+        Id id = world.Pair(world.Entity("Rel"), world.Entity("Obj"));
+
+        Assert.Equal("(Rel,Obj)", id.Str());
+    }
+
+    [Fact]
+    private void RoleIdStr()
+    {
+        using World world = World.Create();
+
+        Id id = new Id(world, ECS_AUTO_OVERRIDE | world.Entity("Foo"));
+
+        Assert.Equal("AUTO_OVERRIDE|Foo", id.Str());
+    }
+
+    [Fact]
+    private void IdStrFromEntity()
+    {
+        using World world = World.Create();
+
+        Entity id = world.Entity("Foo");
+
+        Assert.Equal("Foo", id.Str());
+    }
+
+    [Fact]
+    private void NullEntity()
+    {
+        Entity e = Entity.Null();
+        Assert.True(e.Id == 0);
+    }
+
+    [Fact]
+    private void NullEntityWithWorld()
+    {
+        using World world = World.Create();
+
+        Entity e = Entity.Null(world);
+        Assert.True(e.Id == 0);
+        Assert.True(e.World == world);
+    }
+
+    [Fact]
+    private void NullEntityWith0()
+    {
+        Entity e = new Entity(0);
+        Assert.True(e.Id == 0);
+        Assert.True(e.World == null);
+    }
+
+    [Fact]
+    private void NullENtityWithWorldWith0()
+    {
+        using World world = World.Create();
+
+        Entity e = Entity.Null(world);
+        Assert.True(e.Id == 0);
+        Assert.True(e.World == world);
+    }
+
+    [Fact]
+    private void IsWildcard()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity();
+
+        Entity p0 = e1;
+        Id p1 = world.Pair(e1, e2);
+        Id p2 = world.Pair(e1, Ecs.Wildcard);
+        Id p3 = world.Pair(Ecs.Wildcard, e2);
+        Id p4 = world.Pair(Ecs.Wildcard, Ecs.Wildcard);
+
+        Assert.False(e1.IsWildCard());
+        Assert.False(e2.IsWildCard());
+        Assert.False(p0.IsWildCard());
+        Assert.False(p1.IsWildCard());
+        Assert.True(p2.IsWildCard());
+        Assert.True(p3.IsWildCard());
+        Assert.True(p4.IsWildCard());
+    }
+
+    [Fact]
+    private void HasUlong()
+    {
+        using World world = World.Create();
+
+        ulong id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        ulong id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1);
+
+        Assert.True(e != 0);
+        Assert.True(e.Has(id1));
+        Assert.False(e.Has(id2));
+    }
+
+    [Fact]
+    private void HasPairUlong()
+    {
+        using World world = World.Create();
+
+        ulong id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        ulong id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        ulong id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1, id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Has(id1, id2));
+        Assert.False(e.Has(id1, id3));
+    }
+
+    [Fact]
+    private void HasPairUlongWithType()
+    {
+        using World world = World.Create();
+
+        ulong id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        ulong id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add<Rel>(id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Has<Rel>(id2));
+        Assert.False(e.Has<Rel>(id3));
+    }
+
+    [Fact]
+    private void HasId()
+    {
+        using World world = World.Create();
+
+        Id id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        Id id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1);
+
+        Assert.True(e != 0);
+        Assert.True(e.Has(id1));
+        Assert.False(e.Has(id2));
+    }
+
+    [Fact]
+    private void HasPairId()
+    {
+        using World world = World.Create();
+
+        Id id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        Id id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Id id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1, id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Has(id1, id2));
+        Assert.False(e.Has(id1, id3));
+    }
+
+    [Fact]
+    private void HasPairIdWithType()
+    {
+        using World world = World.Create();
+
+        Id id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Id id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add<Rel>(id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Has<Rel>(id2));
+        Assert.False(e.Has<Rel>(id3));
+    }
+
+    [Fact]
+    private void HasWildCardId()
+    {
+        using World world = World.Create();
+
+        Id id = world.Entity();
+        Assert.True(id != 0);
+
+        Entity e1 = world.Entity().Add(id);
+        Entity e2 = world.Entity();
+
+        Assert.True(e1 != 0);
+        Assert.True(e2 != 0);
+
+        Assert.True(e1.Has(Ecs.Wildcard));
+        Assert.False(e2.Has(Ecs.Wildcard));
+    }
+
+    [Fact]
+    private void HasWildCardPairId()
+    {
+        using World world = World.Create();
+
+        Id rel = world.Entity();
+        Assert.True(rel != 0);
+
+        Id obj = world.Entity();
+        Assert.True(obj != 0);
+
+        Id obj2 = world.Entity();
+        Assert.True(obj2 != 0);
+
+        Id w1 = world.Id(rel, Ecs.Wildcard);
+        Id w2 = world.Id(Ecs.Wildcard, obj);
+
+        Entity e1 = world.Entity().Add(rel, obj);
+        Entity e2 = world.Entity().Add(rel, obj2);
+
+        Assert.True(e1 != 0);
+        Assert.True(e2 != 0);
+
+        Assert.True(e1.Has(w1));
+        Assert.True(e1.Has(w2));
+
+        Assert.True(e2.Has(w1));
+        Assert.False(e2.Has(w2));
+    }
+
+    [Fact]
+    private void OwnsUlong()
+    {
+        using World world = World.Create();
+
+        ulong id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        ulong id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1);
+
+        Assert.True(e != 0);
+        Assert.True(e.Owns(id1));
+        Assert.False(e.Owns(id2));
+    }
+
+    [Fact]
+    private void OwnsPairUlong()
+    {
+        using World world = World.Create();
+
+        ulong id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        ulong id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        ulong id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1, id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Owns(id1, id2));
+        Assert.False(e.Owns(id1, id3));
+    }
+
+    [Fact]
+    private void OwnsPairUlongWithType()
+    {
+        using World world = World.Create();
+
+        ulong id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        ulong id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add<Rel>(id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Owns<Rel>(id2));
+        Assert.False(e.Owns<Rel>(id3));
+    }
+
+    [Fact]
+    private void OwnsId()
+    {
+        using World world = World.Create();
+
+        Id id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        Id id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1);
+
+        Assert.True(e != 0);
+        Assert.True(e.Owns(id1));
+        Assert.False(e.Owns(id2));
+    }
+
+    [Fact]
+    private void OwnsPairId()
+    {
+        using World world = World.Create();
+
+        Id id1 = world.Entity();
+        Assert.True(id1 != 0);
+
+        Id id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Id id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add(id1, id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Owns(id1, id2));
+        Assert.False(e.Owns(id1, id3));
+    }
+
+    [Fact]
+    private void OwnsWildCardId()
+    {
+        using World world = World.Create();
+
+        Id id = world.Entity();
+        Assert.True(id != 0);
+
+        Entity e1 = world.Entity().Add(id);
+        Entity e2 = world.Entity();
+
+        Assert.True(e1 != 0);
+        Assert.True(e2 != 0);
+
+        Assert.True(e1.Owns(Ecs.Wildcard));
+        Assert.False(e2.Owns(Ecs.Wildcard));
+    }
+
+    [Fact]
+    private void OwnsWildcardPair()
+    {
+        using World world = World.Create();
+
+        Id rel = world.Entity();
+        Assert.True(rel != 0);
+
+        Id obj = world.Entity();
+        Assert.True(obj != 0);
+
+        Id obj2 = world.Entity();
+        Assert.True(obj2 != 0);
+
+        Id w1 = world.Id(rel, Ecs.Wildcard);
+        Id w2 = world.Id(Ecs.Wildcard, obj);
+
+        Entity e1 = world.Entity().Add(rel, obj);
+        Entity e2 = world.Entity().Add(rel, obj2);
+
+        Assert.True(e1 != 0);
+        Assert.True(e2 != 0);
+
+        Assert.True(e1.Owns(w1));
+        Assert.True(e1.Owns(w2));
+
+        Assert.True(e2.Owns(w1));
+        Assert.False(e2.Owns(w2));
+    }
+
+    [Fact]
+    private void OwnsPairIdWithType()
+    {
+        using World world = World.Create();
+
+        Id id2 = world.Entity();
+        Assert.True(id2 != 0);
+
+        Id id3 = world.Entity();
+        Assert.True(id3 != 0);
+
+        Entity e = world.Entity()
+            .Add<Rel>(id2);
+
+        Assert.True(e != 0);
+        Assert.True(e.Owns<Rel>(id2));
+        Assert.False(e.Owns<Rel>(id3));
+    }
+
+    [Fact]
+    private void IdFromWorld()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Assert.True(e != 0);
+
+        Id id1 = world.Id(e);
+        Assert.True(id1 != 0);
+        Assert.True(id1 == e);
+        Assert.True(id1.World == world);
+        Assert.False(id1.IsPair());
+        Assert.False(id1.IsWildCard());
+
+        Id id2 = world.Id(Ecs.Wildcard);
+        Assert.True(id2 != 0);
+        Assert.True(id2 == Ecs.Wildcard);
+        Assert.True(id2.World == world);
+        Assert.False(id2.IsPair());
+        Assert.True(id2.IsWildCard());
+    }
+
+    [Fact]
+    private void IdPairFromWorld()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Assert.True(rel != 0);
+
+        Entity obj = world.Entity();
+        Assert.True(obj != 0);
+
+        Id id1 = world.Id(rel, obj);
+        Assert.True(id1 != 0);
+        Assert.True(id1.First() == rel);
+        Assert.True(id1.Second() == obj);
+        Assert.True(id1.World == world);
+        Assert.True(id1.IsPair());
+        Assert.False(id1.IsWildCard());
+
+        Id id2 = world.Id(rel, Ecs.Wildcard);
+        Assert.True(id2 != 0);
+        Assert.True(id2.First() == rel);
+        Assert.True(id2.Second() == Ecs.Wildcard);
+        Assert.True(id2.World == world);
+        Assert.True(id2.IsPair());
+        Assert.True(id2.IsWildCard());
+    }
+
+    [Fact]
+    private void IdDefaultFromWorld()
+    {
+        using World world = World.Create();
+
+        Id idDefault = world.Id();
+        Assert.True(idDefault == 0);
+    }
+
+    [Fact]
+    private void IsA()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity();
+
+        Entity e = world.Entity().IsA(@base);
+
+        Assert.True(e.Has(EcsIsA, @base));
+    }
+
+    [Fact]
+    private void IsAWithType()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity<Prefab>();
+
+        Entity e = world.Entity().IsA<Prefab>();
+
+        Assert.True(e.Has(Ecs.IsA, @base));
+        Assert.True(e.HasSecond<Prefab>(Ecs.IsA));
+    }
+
+    [Fact]
+    private void ChildOf()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity();
+
+        Entity e = world.Entity().ChildOf(@base);
+
+        Assert.True(e.Has(Ecs.ChildOf, @base));
+    }
+
+    [Fact]
+    private void ChildOfWithType()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity<Parent>();
+
+        Entity e = world.Entity().ChildOf<Parent>();
+
+        Assert.True(e.Has(EcsChildOf, @base));
+        Assert.True(e.HasSecond<Parent>(EcsChildOf));
+    }
+
+    [Fact]
+    private void SlotOf()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Prefab();
+        Entity baseChild = world.Prefab()
+            .ChildOf(@base)
+            .SlotOf(@base);
+
+        Assert.True(baseChild.Has(Ecs.SlotOf, @base));
+
+        Entity inst = world.Entity().IsA(@base);
+        Assert.True(inst.Has(baseChild, Ecs.Wildcard));
+    }
+
+    [Fact]
+    private void SlotOfWithType()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Prefab<Parent>();
+        Entity baseChild = world.Prefab()
+            .ChildOf(@base)
+            .SlotOf<Parent>();
+
+        Assert.True(baseChild.Has(Ecs.SlotOf, @base));
+
+        Entity inst = world.Entity().IsA(@base);
+        Assert.True(inst.Has(baseChild, Ecs.Wildcard));
+    }
+
+    [Fact]
+    private void Slot()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Prefab();
+        Entity baseChild = world.Prefab()
+            .ChildOf(@base).Slot();
+
+        Assert.True(baseChild.Has(Ecs.SlotOf, @base));
+
+        Entity inst = world.Entity().IsA(@base);
+        Assert.True(inst.Has(baseChild, Ecs.Wildcard));
+    }
+
+    [Fact]
+    private void IdGetEntity()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        Id id = world.Id(e);
+
+        Assert.True(id.ToEntity() == e);
+    }
+
+    [Fact]
+    private void EachInStage()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Add<Rel, Obj>();
+        Assert.True(e.Has<Rel, Obj>());
+
+        world.ReadonlyBegin();
+
+        World s = world.GetStage(0);
+        Entity em = e.Mut(s);
+        Assert.True(em.Has<Rel, Obj>());
+
+        int count = 0;
+
+        em.Each<Rel>((Entity obj) =>
+        {
+            count++;
+            Assert.True(obj == world.Id<Obj>());
+        });
+
+        Assert.Equal(1, count);
+
+        world.ReadonlyEnd();
+    }
+
+    [Fact]
+    private void IterRecycledParent()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        e.Destruct();
+
+        Entity e2 = world.Entity();
+        Assert.True(e != e2);
+        Assert.True((uint)e.Id == (uint)e2.Id);
+
+        Entity eChild = world.Entity().ChildOf(e2);
+        int count = 0;
+
+        e2.Children((Entity child) =>
+        {
+            count++;
+            Assert.True(child == eChild);
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void GetLambdaFromStage()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Set(new Position(10, 20));
+
+        world.ReadonlyBegin();
+
+        World stage = world.GetStage(0);
+
+        bool invoked = false;
+        e.Mut(stage).Read((ref readonly Position p) =>
+        {
+            invoked = true;
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+        });
+        Assert.True(invoked);
+
+        world.ReadonlyEnd();
+    }
+
+
+    [Fact]
+    private void GetObjByTemplate()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity o1 = world.Entity();
+        Entity o2 = world.Entity();
+
+        e1.Add<Rel>(o1);
+        e1.Add<Rel>(o2);
+
+        Assert.True(o1 == e1.Target<Rel>());
+        Assert.True(o1 == e1.Target<Rel>(0));
+        Assert.True(o2 == e1.Target<Rel>(1));
+    }
+
+    [Fact]
+    private void CreateNamedTwiceDeferred()
+    {
+        using World world = World.Create();
+
+        world.DeferBegin();
+
+        Entity e1 = world.Entity("e");
+        Entity e2 = world.Entity("e");
+
+        Entity f1 = world.Entity("p.f");
+        Entity f2 = world.Entity("p.f");
+
+        Entity g1 = default;
+        Entity g2 = default;
+
+        world.Scope(world.Entity("q"), () => { g1 = world.Entity("g"); });
+
+        world.Scope(world.Entity("q"), () => { g2 = world.Entity("g"); });
+
+        world.DeferEnd();
+
+        Assert.Equal(".e", e1.Path());
+        Assert.Equal(".p.f", f1.Path());
+        Assert.Equal(".q.g", g1.Path());
+
+        Assert.True(e1 == e2);
+        Assert.True(f1 == f2);
+        Assert.True(g1 == g2);
+    }
+
+    [Fact]
+    private void Clone()
+    {
+        using World world = World.Create();
+
+        PositionInitialized v = new PositionInitialized(10, 20);
+
+        Entity src = world.Entity().Add<Tag>().Set(v);
+        Entity dst = src.Clone(false);
+        Assert.True(dst.Has<Tag>());
+        Assert.True(dst.Has<PositionInitialized>());
+
+        PositionInitialized* ptr = dst.GetPtr<PositionInitialized>();
+        Assert.True(ptr != null);
+        Assert.NotEqual(10, ptr->X);
+        Assert.NotEqual(20, ptr->Y);
+    }
+
+    [Fact]
+    private void CloneWithValue()
+    {
+        using World world = World.Create();
+
+        PositionInitialized v = new PositionInitialized(10, 20);
+
+        Entity src = world.Entity().Add<Tag>().Set(v);
+        Entity dst = src.Clone();
+        Assert.True(dst.Has<Tag>());
+        Assert.True(dst.Has<PositionInitialized>());
+
+        PositionInitialized* ptr = dst.GetPtr<PositionInitialized>();
+        Assert.True(ptr != null);
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void CloneToExisting()
+    {
+        using World world = World.Create();
+
+        PositionInitialized v = new PositionInitialized(10, 20);
+
+        Entity src = world.Entity().Add<Tag>().Set(v);
+        Entity dst = world.Entity();
+        Entity result = src.Clone(true, dst);
+        Assert.True(result == dst);
+
+        Assert.True(dst.Has<Tag>());
+        Assert.True(dst.Has<PositionInitialized>());
+
+        PositionInitialized* ptr = dst.GetPtr<PositionInitialized>();
+        Assert.True(ptr != null);
+        Assert.Equal(10, ptr->X);
+        Assert.Equal(20, ptr->Y);
+    }
+
+    [Fact]
+    private void SetDocName()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity("foo_bar")
+            .SetDocName("Foo Bar");
+
+        Assert.Equal("foo_bar", e.Name());
+        Assert.Equal("Foo Bar", e.DocName());
+    }
+
+    [Fact]
+    private void SetDocBrief()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity("foo_bar")
+            .SetDocBrief("Foo Bar");
+
+        Assert.Equal("foo_bar", e.Name());
+        Assert.Equal("Foo Bar", e.DocBrief());
+    }
+
+    [Fact]
+    private void SetDocDetail()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity("foo_bar")
+            .SetDocDetail("Foo Bar");
+
+        Assert.Equal("foo_bar", e.Name());
+        Assert.Equal("Foo Bar", e.DocDetail());
+    }
+
+    [Fact]
+    private void SetDocLink()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity("foo_bar")
+            .SetDocLink("Foo Bar");
+
+        Assert.Equal("foo_bar", e.Name());
+        Assert.Equal("Foo Bar", e.DocLink());
+    }
+
+    [Fact]
+    private void EntityWithRootName()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity(".foo");
+        Assert.Equal("foo", e.Name());
+        Assert.Equal(".foo", e.Path());
+    }
+
+    [Fact]
+    private void EntityWithRootNameFromScope()
+    {
+        using World world = World.Create();
+
+        Entity p = world.Entity("parent");
+        world.SetScope(p);
+        Entity e = world.Entity(".foo");
+        world.SetScope(0);
+
+        Assert.Equal("foo", e.Name());
+        Assert.Equal(".foo", e.Path());
+    }
+
+    [Fact]
+    private void EntityWithType()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity<EntityType>();
+
+        Assert.Equal("EntityType", e.Name());
+        Assert.Equal(".EntityType", e.Path());
+
+        Entity e2 = world.Entity<EntityType>();
+        Assert.True(e == e2);
+    }
+
+    [Fact]
+    private void PrefabWithType()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Prefab<EntityType>();
+
+        Assert.Equal("EntityType", e.Name());
+        Assert.Equal(".EntityType", e.Path());
+        Assert.True(!e.Has<EcsComponent>());
+        Assert.True(e.Has(Ecs.Prefab));
+
+        Entity e2 = world.Entity<EntityType>();
+        Assert.True(e == e2);
+    }
+
+    [Fact]
+    private void PrefabHierarchyWithTypes()
+    {
+        using World world = World.Create();
+
+        Entity turret = world.Prefab<Turret>();
+        Entity turretBase = world.Prefab<Turret.Base>();
+
+        Assert.True(turret != 0);
+        Assert.True(turretBase != 0);
+        Assert.True(turretBase.Has(EcsChildOf, turret));
+
+        Assert.Equal(".Turret", turret.Path());
+        Assert.Equal(".Turret.Base", turretBase.Path());
+
+        Assert.Equal("Turret", turret.Symbol());
+        Assert.Equal("Turret.Base", turretBase.Symbol());
+
+        Entity railgun = world.Prefab<Railgun>().IsA<Turret>();
+        Entity railgunBase = railgun.Lookup("Base");
+        Entity railgunHead = world.Prefab<Railgun.Head>();
+        Entity railgunBeam = world.Prefab<Railgun.Beam>();
+
+        Assert.True(railgun != 0);
+        Assert.True(railgunBase != 0);
+        Assert.True(railgunHead != 0);
+        Assert.True(railgunBeam != 0);
+        Assert.True(railgunBase.Has(EcsChildOf, railgun));
+        Assert.True(railgunHead.Has(EcsChildOf, railgun));
+        Assert.True(railgunBeam.Has(EcsChildOf, railgun));
+
+        Assert.Equal(".Railgun", railgun.Path());
+        Assert.Equal(".Railgun.Base", railgunBase.Path());
+        Assert.Equal(".Railgun.Head", railgunHead.Path());
+        Assert.Equal(".Railgun.Beam", railgunBeam.Path());
+
+        Assert.Equal("Railgun", railgun.Symbol());
+        Assert.Equal("Railgun.Head", railgunHead.Symbol());
+        Assert.Equal("Railgun.Beam", railgunBeam.Symbol());
+    }
+
+    [Fact]
+    private void PrefabHierarchyWithRootTypes()
+    {
+        using World world = World.Create();
+
+        Entity turret = world.Prefab<Turret>();
+        Entity turretBase = world.Prefab<Base>().ChildOf<Turret>();
+
+        Assert.True(turret != 0);
+        Assert.True(turretBase != 0);
+        Assert.True(turretBase.Has(EcsChildOf, turret));
+
+        Assert.Equal(".Turret", turret.Path());
+        Assert.Equal(".Turret.Base", turretBase.Path());
+
+        Assert.Equal("Turret", turret.Symbol());
+        Assert.Equal("Base", turretBase.Symbol());
+
+        Entity inst = world.Entity().IsA<Turret>();
+        Assert.True(inst != 0);
+
+        Entity instBase = inst.Lookup("Base");
+        Assert.True(instBase != 0);
+    }
+
+    [Fact]
+    private void PrefabHierarchyWithChildOverride()
+    {
+        using World world = World.Create();
+
+        Entity t = world.Prefab<Turret>();
+        Entity tb = world.Prefab<Turret.Base>().Add<Foo>();
+        Assert.True(t != 0);
+        Assert.True(tb != 0);
+
+        Entity r = world.Prefab<Railgun>().IsA<Turret>();
+        Entity rb = world.Prefab<Railgun.Base>().Add<Bar>();
+        Assert.True(r != 0);
+        Assert.True(rb != 0);
+
+        Entity i = world.Entity().IsA<Railgun>();
+        Assert.True(i != 0);
+        Entity ib = i.Lookup("Base");
+        Assert.True(ib != 0);
+        Assert.True(ib.Has<Foo>());
+        Assert.True(ib.Has<Bar>());
+    }
+
+    [Fact]
+    private void EntityWithNestedType()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity<Parent.EntityType>();
+        Entity p = world.Entity<Parent>();
+
+        Assert.Equal("EntityType", e.Name());
+        Assert.Equal(".Parent.EntityType", e.Path());
+        Assert.True(e.Has(EcsChildOf, p));
+
+        Entity e2 = world.Entity<Parent.EntityType>();
+        Assert.True(e == e2);
+    }
+
+    [Fact]
+    private void EntityWithTypeDefer()
+    {
+        using World world = World.Create();
+
+        world.DeferBegin();
+        Entity e = world.Entity<Tag>();
+        world.DeferEnd();
+
+        Assert.Equal("Tag", e.Name());
+        Assert.Equal("Tag", e.Symbol());
+        Assert.True(world.Id<Tag>() == e);
+    }
+
+    [Fact]
+    private void AddIfTrueT()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        e.AddIf<Tag>(true);
+        Assert.True(e.Has<Tag>());
+    }
+
+    [Fact]
+    private void AddIfFalseT()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        e.AddIf<Tag>(false);
+        Assert.True(!e.Has<Tag>());
+
+        e.Add<Tag>();
+        Assert.True(e.Has<Tag>());
+        e.AddIf<Tag>(false);
+        Assert.True(!e.Has<Tag>());
+    }
+
+    [Fact]
+    private void AddIfTrueId()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity t = world.Entity();
+
+        e.AddIf(true, t);
+        Assert.True(e.Has(t));
+    }
+
+    [Fact]
+    private void AddIfFalseId()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity t = world.Entity();
+
+        e.AddIf(false, t);
+        Assert.True(!e.Has(t));
+        e.Add(t);
+        Assert.True(e.Has(t));
+        e.AddIf(false, t);
+        Assert.True(!e.Has(t));
+    }
+
+    [Fact]
+    private void AddIfTrueRO()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        e.AddIf<Rel, Obj>(true);
+        Assert.True(e.Has<Rel, Obj>());
+    }
+
+    [Fact]
+    private void AddIfFalseRO()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        e.AddIf<Rel, Obj>(false);
+        Assert.True(!e.Has<Rel, Obj>());
+        e.Add<Rel, Obj>();
+        Assert.True(e.Has<Rel, Obj>());
+        e.AddIf<Rel, Obj>(false);
+        Assert.True(!e.Has<Rel, Obj>());
+    }
+
+    [Fact]
+    private void AddIfTrueRo()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity o = world.Entity();
+
+        e.AddIf<Rel>(true, o);
+        Assert.True(e.Has<Rel>(o));
+    }
+
+    [Fact]
+    private void AddIfFalseRo()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity o = world.Entity();
+
+        e.AddIf<Rel>(false, o);
+        Assert.True(!e.Has<Rel>(o));
+        e.Add<Rel>(o);
+        Assert.True(e.Has<Rel>(o));
+        e.AddIf<Rel>(false, o);
+        Assert.True(!e.Has<Rel>(o));
+    }
+
+    [Fact]
+    private void AddIfTruero()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity r = world.Entity();
+        Entity o = world.Entity();
+
+        e.AddIf(true, r, o);
+        Assert.True(e.Has(r, o));
+    }
+
+    [Fact]
+    private void AddIfFalsero()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity r = world.Entity();
+        Entity o = world.Entity();
+
+        e.AddIf(false, r, o);
+        Assert.True(!e.Has(r, o));
+        e.Add(r, o);
+        Assert.True(e.Has(r, o));
+        e.AddIf(false, r, o);
+        Assert.True(!e.Has(r, o));
+    }
+
+    [Fact]
+    private void AddIfExclusivero()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity r = world.Entity().Add(Ecs.Exclusive);
+        Entity o1 = world.Entity();
+        Entity o2 = world.Entity();
+
+        e.Add(r, o1);
+        Assert.True(e.Has(r, o1));
+
+        e.AddIf(true, r, o2);
+        Assert.True(!e.Has(r, o1));
+        Assert.True(e.Has(r, o2));
+
+        e.AddIf(false, r, o1);
+        Assert.True(!e.Has(r, o1));
+        Assert.True(!e.Has(r, o2));
+    }
+
+    [Fact]
+    private void AddIfExclusiveRo()
+    {
+        using World world = World.Create();
+
+        world.Component<First>().Add(Ecs.Exclusive);
+
+        Entity e = world.Entity();
+        Entity o1 = world.Entity();
+        Entity o2 = world.Entity();
+
+        e.Add<First>(o1);
+        Assert.True(e.Has<First>(o1));
+
+        e.AddIf<First>(true, o2);
+        Assert.True(!e.Has<First>(o1));
+        Assert.True(e.Has<First>(o2));
+
+        e.AddIf<First>(false, o1);
+        Assert.True(!e.Has<First>(o1));
+        Assert.True(!e.Has<First>(o2));
+    }
+
+    [Fact]
+    private void AddIfExclusiveRO()
+    {
+        using World world = World.Create();
+
+        world.Component<R>().Add(Ecs.Exclusive);
+
+        Entity e = world.Entity();
+
+        e.Add<R, O1>();
+        Assert.True(e.Has<R, O1>());
+
+        e.AddIf<R, O2>(true);
+        Assert.True(!e.Has<R, O1>());
+        Assert.True(e.Has<R, O2>());
+
+        e.AddIf<R, O1>(false);
+        Assert.True(!e.Has<R, O1>());
+        Assert.True(!e.Has<R, O2>());
+    }
+
+    [Fact]
+    private void AddIfPairWith0Object()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+        Entity r = world.Entity();
+        Entity o1 = world.Entity();
+
+        e.Add(r, o1);
+        Assert.True(e.Has(r, o1));
+
+        e.AddIf(false, r, 0);
+        Assert.True(!e.Has(r, o1));
+        Assert.True(!e.Has(r, Ecs.Wildcard));
+    }
+
+    [Fact]
+    private void ChildrenWithCustomRelation()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+
+        Entity parent = world.Entity();
+        Entity child1 = world.Entity().Add(rel, parent);
+        Entity child2 = world.Entity().Add(rel, parent);
+        world.Entity().ChildOf(parent);
+
+        bool child1Found = false;
+        bool child2Found = false;
+        int count = 0;
+
+        parent.Children(rel, (Entity child) =>
+        {
+            if (child == child1)
+                child1Found = true;
+            else if (child == child2) child2Found = true;
+            count++;
+        });
+
+        Assert.Equal(2, count);
+        Assert.True(child1Found);
+        Assert.True(child2Found);
+    }
+
+    [Fact]
+    private void ChildrenWithCustomRelationType()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity();
+        Entity child1 = world.Entity().Add<Rel>(parent);
+        Entity child2 = world.Entity().Add<Rel>(parent);
+        world.Entity().ChildOf(parent);
+
+        bool child1Found = false;
+        bool child2Found = false;
+        int count = 0;
+
+        parent.Children<Rel>((Entity child) =>
+        {
+            if (child == child1)
+                child1Found = true;
+            else if (child == child2) child2Found = true;
+            count++;
+        });
+
+        Assert.Equal(2, count);
+        Assert.True(child1Found);
+        Assert.True(child2Found);
+    }
+
+    [Fact]
+    private void ChildrenWithThis()
+    {
+        using World world = World.Create();
+
+        int count = 0;
+        world.Entity(Ecs.This).Children((Entity e) => { count++; });
+        Assert.True(count == 0);
+    }
+
+    [Fact]
+    private void ChildrenWithWildcard()
+    {
+        using World world = World.Create();
+
+        int count = 0;
+        world.Entity(Ecs.Wildcard).Children((Entity e) => { count++; });
+        Assert.True(count == 0);
+    }
+
+    [Fact]
+    private void ChildrenWithAny()
+    {
+        using World world = World.Create();
+
+        int count = 0;
+        world.Entity(Ecs.Any).Children((Entity e) => { count++; });
+        Assert.True(count == 0);
+    }
+
+    [Fact]
+    private void GetDepth()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity().ChildOf(e1);
+        Entity e3 = world.Entity().ChildOf(e2);
+        Entity e4 = world.Entity().ChildOf(e3);
+
+        Assert.Equal(0, e1.Depth(EcsChildOf));
+        Assert.Equal(1, e2.Depth(EcsChildOf));
+        Assert.Equal(2, e3.Depth(EcsChildOf));
+        Assert.Equal(3, e4.Depth(EcsChildOf));
+    }
+
+    [Fact]
+    private void GetDepthWithType()
+    {
+        using World world = World.Create();
+
+        world.Component<Rel>().Add(EcsTraversable);
+
+        Entity e1 = world.Entity();
+        Entity e2 = world.Entity().Add<Rel>(e1);
+        Entity e3 = world.Entity().Add<Rel>(e2);
+        Entity e4 = world.Entity().Add<Rel>(e3);
+
+        Assert.Equal(0, e1.Depth<Rel>());
+        Assert.Equal(1, e2.Depth<Rel>());
+        Assert.Equal(2, e3.Depth<Rel>());
+        Assert.Equal(3, e4.Depth<Rel>());
+    }
+
+    [Fact]
+    private void SetAlias()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity("parent.child");
+        e.SetAlias("parent_child");
+
+        Assert.True(e == world.Lookup("parent.child"));
+        Assert.True(e == world.Lookup("parent_child"));
+    }
+
+    [Fact]
+    private void EntityLookupNotRecursive()
+    {
+        using World world = World.Create();
+
+        Entity child = default;
+        Entity foo = default;
+
+        world.Entity("parent").Scope(() =>
+        {
+            child = world.Entity("child");
+            foo = world.Entity("foo");
+        });
+
+        Assert.True(child.Lookup("foo") == 0);
+        Assert.True(child.Lookup("foo", true) == foo);
+    }
+
+    [Fact]
+    private void WorldLookupNotRecursive()
+    {
+        using World world = World.Create();
+
+        Entity child = default;
+        Entity foo = default;
+
+        world.Entity("parent").Scope(() =>
+        {
+            child = world.Entity("child");
+            foo = world.Entity("foo");
+        });
+
+        child.Scope(() =>
+        {
+            Assert.True(world.Lookup("foo") == foo);
+            Assert.True(world.Lookup("foo", ".", ".", false) == 0);
+        });
+    }
+
+    [Fact]
+    private void WorldLookupCustomSep()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity("parent");
+        Entity child = default;
+        Entity foo = default;
+
+        parent.Scope(() =>
+        {
+            child = world.Entity("child");
+            foo = world.Entity("foo");
+        });
+
+        Assert.True(world.Lookup("parent::child", "::") == child);
+        Assert.True(world.Lookup("parent::foo", "::") == foo);
+    }
+
+    [Fact]
+    private void WorldLookupCustomRootSep()
+    {
+        using World world = World.Create();
+
+        Entity parent = world.Entity("parent");
+        Entity child = default;
+        Entity foo = default;
+
+        parent.Scope(() =>
+        {
+            child = world.Entity("child");
+            foo = world.Entity("foo");
+        });
+
+        Assert.True(world.Lookup("::parent::child", "::", "::") == child);
+        Assert.True(world.Lookup("::parent::foo", "::", "::") == foo);
+    }
+
+    [Fact]
+    private void DependsOn()
+    {
+        using World world = World.Create();
+
+        Entity a = world.Entity();
+        Entity b = world.Entity().DependsOn(a);
+        Assert.True(b.Has(Ecs.DependsOn, a));
+    }
+
+    [Fact]
+    private void DependsOnType()
+    {
+        using World world = World.Create();
+
+        Entity b = world.Entity().DependsOn<Position>();
+        Assert.True(b.Has(Ecs.DependsOn, world.Id<Position>()));
+    }
+
+    [Fact]
+    private void SetSparse()
+    {
+        using World world = World.Create();
+
+        world.Component<Velocity>().Add(Ecs.Sparse);
+
+        Entity e = world.Entity().Set(new Velocity(1, 2));
+
+        Assert.True(e.Has<Velocity>());
+
+        Velocity* v = e.GetPtr<Velocity>();
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+    }
+
+    [Fact]
+    private void Insert1Sparse()
+    {
+        using World world = World.Create();
+
+        world.Component<Velocity>().Add(Ecs.Sparse);
+
+        Entity e = world.Entity().Insert((ref Velocity v) =>
+        {
+            v.X = 1;
+            v.Y = 2;
+        });
+
+        Assert.True(e.Has<Velocity>());
+
+        Velocity* v = e.GetPtr<Velocity>();
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+    }
+
+    [Fact]
+    private void Insert2With1Sparse()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>().Add(Ecs.Sparse);
+
+        Entity e = world.Entity().Insert((ref Position p, ref Velocity v) =>
+        {
+            p.X = 10;
+            p.Y = 20;
+            v.X = 1;
+            v.Y = 2;
+        });
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+
+        Position* p = e.GetPtr<Position>();
+        Assert.Equal(10, p->X);
+        Assert.Equal(20, p->Y);
+
+        Velocity* v = e.GetPtr<Velocity>();
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+    }
+
+    [Fact]
+    private void OverrideSparse()
+    {
+        using World world = World.Create();
+
+        world.Component<Velocity>().Add(Ecs.Sparse);
+
+        Entity @base = world.Entity().Set(new Velocity(1, 2));
+
+        Entity e = world.Entity().IsA(@base);
+
+        Assert.True(e.Has<Velocity>());
+        Assert.True(e.Owns<Velocity>());
+
+        Velocity* v = e.GetPtr<Velocity>();
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+    }
+
+    [Fact]
+    private void DeleteWithOverrideSparse()
+    {
+        using World world = World.Create();
+
+        world.Component<Velocity>().Add(Ecs.Sparse);
+
+        Entity @base = world.Entity().Set(new Velocity(1, 2));
+
+        Entity e = world.Entity().IsA(@base);
+
+        Assert.True(e.Has<Velocity>());
+        Assert.True(e.Owns<Velocity>());
+
+        Velocity* v = e.GetPtr<Velocity>();
+        Assert.Equal(1, v->X);
+        Assert.Equal(2, v->Y);
+
+        e.Destruct();
+    }
+
+    [Fact]
+    private void IterType()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Add<Position>().Add<Velocity>();
+
+        int count = 0;
+        bool posFound = false;
+        bool velocityFound = false;
+
+        foreach (Id id in e.Type())
+        {
+            count++;
+
+            if (id == world.Id<Position>())
+                posFound = true;
+
+            if (id == world.Id<Velocity>())
+                velocityFound = true;
+        }
+
+        Assert.Equal(2, count);
+        Assert.True(posFound);
+        Assert.True(velocityFound);
+    }
+
+    [Fact]
+    private void IterEmptyType()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity();
+
+        int count = 0;
+
+        foreach (Id id in e.Type())
+        {
+            Assert.True(id != 0);
+            count++;
+        }
+
+        Assert.Equal(0, count);
+    }
+}
diff --git a/src/Flecs.NET.Tests/Cpp/QueryTests.cs b/src/Flecs.NET.Tests/Cpp/QueryTests.cs
index c57941b2..5349facf 100644
--- a/src/Flecs.NET.Tests/Cpp/QueryTests.cs
+++ b/src/Flecs.NET.Tests/Cpp/QueryTests.cs
@@ -1,3563 +1,3565 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Flecs.NET.Core;
-using Xunit;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Tests.Cpp;
-
-[SuppressMessage("ReSharper", "ParameterOnlyUsedForPreconditionCheck.Local")]
-[SuppressMessage("ReSharper", "CompareOfFloatsByEqualityOperator")]
-[SuppressMessage("ReSharper", "AccessToDisposedClosure")]
-[SuppressMessage("ReSharper", "AccessToModifiedClosure")]
-[SuppressMessage("ReSharper", "VariableHidesOuterVariable")]
-public unsafe class QueryTests
-{
-    public static int InvokedCount;
-
-    public QueryTests()
-    {
-        InvokedCount = default;
-    }
-
-    [Fact]
-    private void TermEachComponent()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Set(new Position(1, 2));
-        Entity e2 = world.Entity().Set(new Position(3, 4));
-        Entity e3 = world.Entity().Set(new Position(5, 6));
-
-        e3.Add<Tag>();
-
-        int count = 0;
-        world.Each((Entity e, ref Position p) =>
-        {
-            if (e == e1)
-            {
-                Assert.Equal(1, p.X);
-                Assert.Equal(2, p.Y);
-                count++;
-            }
-
-            if (e == e2)
-            {
-                Assert.Equal(3, p.X);
-                Assert.Equal(4, p.Y);
-                count++;
-            }
-
-            if (e == e3)
-            {
-                Assert.Equal(5, p.X);
-                Assert.Equal(6, p.Y);
-                count++;
-            }
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    // TODO: Remove this?
-    // [Fact]
-    // private void TermEachTag()
-    // {
-    //     using World world = World.Create();
-    //
-    //     Entity e1 = world.Entity().Add<Foo>();
-    //     Entity e2 = world.Entity().Add<Foo>();
-    //     Entity e3 = world.Entity().Add<Foo>();
-    //
-    //     e3.Add<Tag>();
-    //
-    //     int count = 0;
-    //     world.Each((Entity e, ref Foo _) =>
-    //     {
-    //         if (e == e1 || e == e2 || e == e3) count++;
-    //     });
-    //
-    //     Assert.Equal(3, count);
-    // }
-
-    [Fact]
-    private void TermEachId()
-    {
-        using World world = World.Create();
-
-        Entity foo = world.Entity();
-
-        Entity e1 = world.Entity().Add(foo);
-        Entity e2 = world.Entity().Add(foo);
-        Entity e3 = world.Entity().Add(foo);
-
-        e3.Add<Tag>();
-
-        int count = 0;
-        world.Each(foo, (Entity e) =>
-        {
-            if (e == e1 || e == e2 || e == e3) count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void TermEachPairId()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Entity obj = world.Entity();
-
-        Entity e1 = world.Entity().Add(rel, obj);
-        Entity e2 = world.Entity().Add(rel, obj);
-        Entity e3 = world.Entity().Add(rel, obj);
-
-        e3.Add<Tag>();
-
-        int count = 0;
-        world.Each(world.Pair(rel, obj), (Entity e) =>
-        {
-            if (e == e1 || e == e2 || e == e3) count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void TermEachPairRelationWildcard()
-    {
-        using World world = World.Create();
-
-        Entity rel1 = world.Entity();
-        Entity rel2 = world.Entity();
-        Entity obj = world.Entity();
-
-        Entity e1 = world.Entity().Add(rel1, obj);
-        Entity e2 = world.Entity().Add(rel1, obj);
-        Entity e3 = world.Entity().Add(rel2, obj);
-
-        e3.Add<Tag>();
-
-        int count = 0;
-        world.Each(world.Pair(Ecs.Wildcard, obj), (Entity e) =>
-        {
-            if (e == e1 || e == e2 || e == e3) count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void TermEachPairObjectWildcard()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Entity obj1 = world.Entity();
-        Entity obj2 = world.Entity();
-
-        Entity e1 = world.Entity().Add(rel, obj1);
-        Entity e2 = world.Entity().Add(rel, obj1);
-        Entity e3 = world.Entity().Add(rel, obj2);
-
-        e3.Add<Tag>();
-
-        int count = 0;
-        world.Each(world.Pair(rel, Ecs.Wildcard), (Entity e) =>
-        {
-            if (e == e1 || e == e2 || e == e3) count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void TermGetId()
-    {
-        using World world = World.Create();
-
-        Entity foo = world.Entity();
-        Entity bar = world.Entity();
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With<Velocity>()
-            .With(foo, bar)
-            .Build();
-
-        Assert.Equal(3, q.FieldCount());
-
-        Term
-            t = q.Term(0);
-        Assert.True(t.Id() == world.Id<Position>());
-        t = q.Term(1);
-        Assert.True(t.Id() == world.Id<Velocity>());
-        t = q.Term(2);
-        Assert.True(t.Id() == world.Pair(foo, bar));
-    }
-
-    [Fact]
-    private void TermGetSubj()
-    {
-        using World world = World.Create();
-
-        Entity foo = world.Entity();
-        Entity bar = world.Entity();
-        Entity src = world.Entity();
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With<Velocity>().Src(src)
-            .With(foo, bar)
-            .Build();
-
-        Assert.Equal(3, q.FieldCount());
-
-        Term
-            t = q.Term(0);
-        Assert.True(t.GetSrc() == Ecs.This);
-        t = q.Term(1);
-        Assert.True(t.GetSrc() == src);
-        t = q.Term(2);
-        Assert.True(t.GetSrc() == Ecs.This);
-    }
-
-    [Fact]
-    private void TermGetPred()
-    {
-        using World world = World.Create();
-
-        Entity foo = world.Entity();
-        Entity bar = world.Entity();
-        Entity src = world.Entity();
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With<Velocity>().Src(src)
-            .With(foo, bar)
-            .Build();
-
-        Assert.Equal(3, q.FieldCount());
-
-        Term
-            t = q.Term(0);
-        Assert.True(t.GetFirst() == world.Id<Position>());
-        t = q.Term(1);
-        Assert.True(t.GetFirst() == world.Id<Velocity>());
-        t = q.Term(2);
-        Assert.True(t.GetFirst() == foo);
-    }
-
-    [Fact]
-    private void TermGetObj()
-    {
-        using World world = World.Create();
-
-        Entity foo = world.Entity();
-        Entity bar = world.Entity();
-        Entity src = world.Entity();
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With<Velocity>().Src(src)
-            .With(foo, bar)
-            .Build();
-
-        Assert.Equal(3, q.FieldCount());
-
-        Term
-            t = q.Term(0);
-        Assert.True(t.GetSecond() == 0);
-        t = q.Term(1);
-        Assert.True(t.GetSecond() == 0);
-        t = q.Term(2);
-        Assert.True(t.GetSecond() == bar);
-    }
-
-    [Fact]
-    private void GetFirst()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Add<A>();
-        world.Entity().Add<A>();
-        world.Entity().Add<A>();
-
-        using Query q = world.QueryBuilder()
-            .With<A>()
-            .Build();
-
-        Entity first = q.Iter().First();
-        Assert.True(first != 0);
-        Assert.True(first == e1);
-    }
-
-    [Fact]
-    private void GetCountDirect()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<A>();
-        world.Entity().Add<A>();
-        world.Entity().Add<A>();
-
-        using Query q = world.QueryBuilder()
-            .With<A>()
-            .Build();
-
-        Assert.Equal(3, q.Count());
-    }
-
-    [Fact]
-    private void GetIsTrueDirect()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<A>();
-        world.Entity().Add<A>();
-        world.Entity().Add<A>();
-
-        using Query q1 = world.QueryBuilder()
-            .With<A>()
-            .Build();
-
-        using Query q2 = world.QueryBuilder()
-            .With<B>()
-            .Build();
-
-        Assert.True(q1.IsTrue());
-        Assert.False(q2.IsTrue());
-    }
-
-    [Fact]
-    private void GetFirstDirect()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Add<A>();
-        world.Entity().Add<A>();
-        world.Entity().Add<A>();
-
-        using Query q = world.QueryBuilder()
-            .With<A>()
-            .Build();
-
-        Entity first = q.First();
-        Assert.True(first != 0);
-        Assert.True(first == e1);
-    }
-
-    [Fact]
-    private void EachWithNoThis()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> f = world.QueryBuilder<Position, Velocity>()
-            .TermAt(0).Src(e)
-            .TermAt(1).Src(e)
-            .Build();
-
-        int count = 0;
-
-        f.Each((ref Position p, ref Velocity v) =>
-        {
-            count++;
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void EachWithIterNoThis()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> f = world.QueryBuilder<Position, Velocity>()
-            .TermAt(0).Src(e)
-            .TermAt(1).Src(e)
-            .Build();
-
-        int count = 0;
-
-        f.Each((Iter it, int index, ref Position p, ref Velocity v) =>
-        {
-            count++;
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-            Assert.Equal(1, v.X);
-            Assert.Equal(2, v.Y);
-            Assert.Equal(0, index);
-            Assert.Equal(0, it.Count());
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    // [Fact]
-    // private void InvalidEachWithNoThis()
-    // {
-    //     install_test_abort();
-    //
-    //     using World world = World.Create();
-    //
-    //     Entity e = world.Entity()
-    //         .Set(new Position(10, 20))
-    //         .Set(new Velocity(1, 2));
-    //
-    //     using var f = world.QueryBuilder<Position, Velocity>()
-    //         .TermAt(0).Src(e)
-    //         .TermAt(1).Src(e)
-    //         .Build();
-    //
-    //     test_expect_abort();
-    //
-    //     f.Each((Entity e, ref Position p, ref Velocity v) => { });
-    // }
-
-    [Fact]
-    private void NamedQuery()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Add<Position>();
-        Entity e2 = world.Entity().Add<Position>();
-
-        using Query<Position> q = world.Query<Position>("my_query");
-
-        int count = 0;
-        q.Each((Entity e, ref Position _) =>
-        {
-            Assert.True(e == e1 || e == e2);
-            count++;
-        });
-        Assert.Equal(2, count);
-
-        Entity qe = q.Entity();
-        Assert.True(qe != 0);
-        Assert.Equal("my_query", qe.Name());
-    }
-
-    [Fact]
-    private void NamedScopedQuery()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Add<Position>();
-        Entity e2 = world.Entity().Add<Position>();
-
-        using Query<Position> q = world.Query<Position>("my.query");
-
-        int count = 0;
-        q.Each((Entity e, ref Position _) =>
-        {
-            Assert.True(e == e1 || e == e2);
-            count++;
-        });
-        Assert.Equal(2, count);
-
-        Entity qe = q.Entity();
-        Assert.True(qe != 0);
-        Assert.Equal("query", qe.Name());
-        Assert.Equal(".my.query", qe.Path());
-    }
-
-    [Fact]
-    private void SetThisVar()
-    {
-        using World world = World.Create();
-
-        world.Entity().Set(new Position(1, 2));
-        Entity e2 = world.Entity().Set(new Position(3, 4));
-        world.Entity().Set(new Position(5, 6));
-
-        using Query<Position> q = world.Query<Position>("my.query");
-
-        int count = 0;
-        q.Iter().SetVar(0, e2).Each((Entity e, ref Position _) =>
-        {
-            Assert.True(e == e2);
-            count++;
-        });
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void InspectTermsWithExpr()
-    {
-        using World world = World.Create();
-
-        using Query f = world.QueryBuilder()
-            .Expr("(ChildOf,#0)")
-            .Build();
-
-        int count = 0;
-        f.EachTerm((ref Term term) =>
-        {
-            Assert.True(term.Id().IsPair());
-            count++;
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void Find()
-    {
-        using World world = World.Create();
-
-        world.Entity().Set(new Position(10, 20));
-        Entity e2 = world.Entity().Set(new Position(20, 30));
-
-        using Query<Position> q = world.Query<Position>();
-
-        Entity r = q.Find((ref Position p) => { return p.X == 20; });
-
-        Assert.True(r == e2);
-    }
-
-    [Fact]
-    private void FindNotFound()
-    {
-        using World world = World.Create();
-
-        world.Entity().Set(new Position(10, 20));
-        world.Entity().Set(new Position(20, 30));
-
-        using Query<Position> q = world.Query<Position>();
-
-        Entity r = q.Find((ref Position p) => { return p.X == 30; });
-
-        Assert.True(r == 0);
-    }
-
-    [Fact]
-    private void FindWithEntity()
-    {
-        using World world = World.Create();
-
-        world.Entity().Set(new Position(10, 20)).Set(new Velocity(20, 30));
-        Entity e2 = world.Entity().Set(new Position(20, 30)).Set(new Velocity(20, 30));
-
-        using Query<Position> q = world.Query<Position>();
-
-        Entity r = q.Find((Entity e, ref Position p) =>
-        {
-            return p.X == e.GetPtr<Velocity>()->X &&
-                   p.Y == e.GetPtr<Velocity>()->Y;
-        });
-
-        Assert.True(r == e2);
-    }
-
-    [Fact]
-    private void FindWithMatchEmptyTables()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Set(new Position(10, 20)).Add<Velocity>();
-        e1.Destruct();
-        Entity e2 = world.Entity().Set(new Position(20, 30));
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .QueryFlags(Ecs.QueryMatchEmptyTables)
-            .Build();
-
-        Entity r = q.Find((ref Position p) =>
-        {
-            return p.X == 20;
-        });
-
-        Assert.True(r == e2);
-    }
-
-    [Fact]
-    private void FindWithEntityWithMatchEmptyTables()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Set(new Position(10, 20)).Add<Velocity>();
-        e1.Destruct();
-        Entity e2 = world.Entity().Set(new Position(20, 30));
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .QueryFlags(EcsQueryMatchEmptyTables)
-            .Build();
-
-        Entity r = q.Find((Entity e, ref Position p) =>
-        {
-            return p.X == 20;
-        });
-
-        Assert.True(r == e2);
-    }
-
-    [Fact]
-    private void Run()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                foreach (int i in it)
-                {
-                    p[i].X += v[i].X;
-                    p[i].Y += v[i].Y;
-                }
-            }
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void RunConst()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                foreach (int i in it)
-                {
-                    p[i].X += v[i].X;
-                    p[i].Y += v[i].Y;
-                }
-            }
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void RunShared()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .Set(new Velocity(1, 2));
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Add(Ecs.IsA, @base);
-
-        Entity e2 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(3, 4));
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .Expr("Velocity(self|up IsA)")
-            .Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                if (!it.IsSelf(1))
-                    foreach (int i in it)
-                    {
-                        p[i].X += v[0].X;
-                        p[i].Y += v[0].Y;
-                    }
-                else
-                    foreach (int i in it)
-                    {
-                        p[i].X += v[i].X;
-                        p[i].Y += v[i].Y;
-                    }
-            }
-        });
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        p = e2.GetPtr<Position>();
-        Assert.Equal(13, p->X);
-        Assert.Equal(24, p->Y);
-    }
-
-    [Fact]
-    private void RunOptional()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-        world.Component<Mass>();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2))
-            .Set(new Mass(1));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(30, 40))
-            .Set(new Velocity(3, 4))
-            .Set(new Mass(1));
-
-        Entity e3 = world.Entity()
-            .Set(new Position(50, 60));
-
-        Entity e4 = world.Entity()
-            .Set(new Position(70, 80));
-
-        using Query<Position, Velocity, Mass> q = world.QueryBuilder<Position, Velocity, Mass>()
-            .TermAt(1).Optional()
-            .TermAt(2).Optional()
-            .Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-                Field<Mass> m = it.Field<Mass>(2);
-
-                if (it.IsSet(1) && it.IsSet(2))
-                    foreach (int i in it)
-                    {
-                        p[i].X += v[i].X * m[i].Value;
-                        p[i].Y += v[i].Y * m[i].Value;
-                    }
-                else
-                    foreach (int i in it)
-                    {
-                        p[i].X++;
-                        p[i].Y++;
-                    }
-            }
-        });
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        p = e2.GetPtr<Position>();
-        Assert.Equal(33, p->X);
-        Assert.Equal(44, p->Y);
-
-        p = e3.GetPtr<Position>();
-        Assert.Equal(51, p->X);
-        Assert.Equal(61, p->Y);
-
-        p = e4.GetPtr<Position>();
-        Assert.Equal(71, p->X);
-        Assert.Equal(81, p->Y);
-    }
-
-    [Fact]
-    private void RunSparse()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.Sparse);
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                foreach (int i in it)
-                {
-                    ref Position p = ref it.FieldAt<Position>(0, i);
-                    p.X += v[i].X;
-                    p.Y += v[i].Y;
-                }
-            }
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void RunSparseWithWith()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.Sparse);
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With<Velocity>()
-            .Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                foreach (int i in it)
-                {
-                    ref Position p = ref it.FieldAt<Position>(0, i);
-                    p.X += v[i].X;
-                    p.Y += v[i].Y;
-                }
-            }
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void Each()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Each((ref Position p, ref Velocity v) =>
-        {
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void EachConst()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Each((ref Position p, ref Velocity v) =>
-        {
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void EachShared()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity @base = world.Entity()
-            .Set(new Velocity(1, 2));
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Add(Ecs.IsA, @base);
-
-        Entity e2 = world.Entity()
-            .Set(new Position(20, 30))
-            .Add(Ecs.IsA, @base);
-
-        Entity e3 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(3, 4));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Each((ref Position p, ref Velocity v) =>
-        {
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        p = e2.GetPtr<Position>();
-        Assert.Equal(21, p->X);
-        Assert.Equal(32, p->Y);
-
-        p = e3.GetPtr<Position>();
-        Assert.Equal(13, p->X);
-        Assert.Equal(24, p->Y);
-    }
-
-    [Fact]
-    private void EachOptional()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-        world.Component<Mass>();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2))
-            .Set(new Mass(1));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(30, 40))
-            .Set(new Velocity(3, 4))
-            .Set(new Mass(1));
-
-        Entity e3 = world.Entity()
-            .Set(new Position(50, 60));
-
-        Entity e4 = world.Entity()
-            .Set(new Position(70, 80));
-
-        using Query<Position, Velocity, Mass> q = world.QueryBuilder<Position, Velocity, Mass>()
-            .TermAt(1).Optional()
-            .TermAt(2).Optional()
-            .Build();
-
-        q.Each((ref Position p, ref Velocity v, ref Mass m) =>
-        {
-            if (!Unsafe.IsNullRef(ref v) && !Unsafe.IsNullRef(ref m))
-            {
-                p.X += v.X * m.Value;
-                p.Y += v.Y * m.Value;
-            }
-            else
-            {
-                p.X++;
-                p.Y++;
-            }
-        });
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        p = e2.GetPtr<Position>();
-        Assert.Equal(33, p->X);
-        Assert.Equal(44, p->Y);
-
-        p = e3.GetPtr<Position>();
-        Assert.Equal(51, p->X);
-        Assert.Equal(61, p->Y);
-
-        p = e4.GetPtr<Position>();
-        Assert.Equal(71, p->X);
-        Assert.Equal(81, p->Y);
-    }
-
-    [Fact]
-    private void EachSparse()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.Sparse);
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Each((ref Position p, ref Velocity v) =>
-        {
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void EachSparseWithWith()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.Sparse);
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With<Velocity>()
-            .Build();
-
-        q.Each((Iter it, int row) =>
-        {
-            ref Position p = ref it.FieldAt<Position>(0, row);
-            ref Velocity v = ref it.FieldAt<Velocity>(1, row);
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void EachSparseMany()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.Sparse);
-        world.Component<Velocity>();
-
-        List<Entity> entities = new List<Entity>();
-
-        for (int i = 0; i < 2000; i++)
-        {
-            entities.Add(
-                world.Entity()
-                    .Set(new Position(10 + i, 20 + i))
-                    .Set(new Velocity(i, i))
-            );
-        }
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        q.Each(static (ref Position p, ref Velocity v) =>
-        {
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        for (int i = 0; i < 2000; i++)
-        {
-            Entity e = entities[i];
-
-            Position* p = e.GetPtr<Position>();
-            Assert.Equal(10 + i * 2, p->X);
-            Assert.Equal(20 + i * 2, p->Y);
-
-            Velocity* v = e.GetPtr<Velocity>();
-            Assert.Equal(i, v->X);
-            Assert.Equal(i, v->Y);
-        }
-    }
-
-    [Fact]
-    private void Signature()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query q = world.QueryBuilder().Expr("Position, Velocity").Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                foreach (int i in it)
-                {
-                    p[i].X += v[i].X;
-                    p[i].Y += v[i].Y;
-                }
-            }
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void SignatureConst()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity entity = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        using Query q = world.QueryBuilder().Expr("Position, [in] Velocity").Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                foreach (int i in it)
-                {
-                    p[i].X += v[i].X;
-                    p[i].Y += v[i].Y;
-                }
-            }
-        });
-
-        Position* p = entity.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-    }
-
-    [Fact]
-    private void SignatureShared()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
-
-        Entity @base = world.Entity()
-            .Set(new Velocity(1, 2));
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Add(Ecs.IsA, @base);
-
-        Entity e2 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(3, 4));
-
-        using Query q = world.QueryBuilder()
-            .Expr("Position, [in] Velocity(self|up IsA)")
-            .Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-
-                if (!it.IsSelf(1))
-                    foreach (int i in it)
-                    {
-                        p[i].X += v[0].X;
-                        p[i].Y += v[0].Y;
-                    }
-                else
-                    foreach (int i in it)
-                    {
-                        p[i].X += v[i].X;
-                        p[i].Y += v[i].Y;
-                    }
-            }
-        });
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        p = e2.GetPtr<Position>();
-        Assert.Equal(13, p->X);
-        Assert.Equal(24, p->Y);
-    }
-
-    [Fact]
-    private void SignatureOptional()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-        world.Component<Mass>();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2))
-            .Set(new Mass(1));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(30, 40))
-            .Set(new Velocity(3, 4))
-            .Set(new Mass(1));
-
-        Entity e3 = world.Entity()
-            .Set(new Position(50, 60));
-
-        Entity e4 = world.Entity()
-            .Set(new Position(70, 80));
-
-        using Query q = world.QueryBuilder().Expr("Position, ?Velocity, ?Mass").Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Field<Velocity> v = it.Field<Velocity>(1);
-                Field<Mass> m = it.Field<Mass>(2);
-
-                if (it.IsSet(1) && it.IsSet(2))
-                    foreach (int i in it)
-                    {
-                        p[i].X += v[i].X * m[i].Value;
-                        p[i].Y += v[i].Y * m[i].Value;
-                    }
-                else
-                    foreach (int i in it)
-                    {
-                        p[i].X++;
-                        p[i].Y++;
-                    }
-            }
-        });
-
-        Position* p = e1.GetPtr<Position>();
-        Assert.Equal(11, p->X);
-        Assert.Equal(22, p->Y);
-
-        p = e2.GetPtr<Position>();
-        Assert.Equal(33, p->X);
-        Assert.Equal(44, p->Y);
-
-        p = e3.GetPtr<Position>();
-        Assert.Equal(51, p->X);
-        Assert.Equal(61, p->Y);
-
-        p = e4.GetPtr<Position>();
-        Assert.Equal(71, p->X);
-        Assert.Equal(81, p->Y);
-    }
-
-    [Fact]
-    private void QuerySinglePair()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<Pair, Position>();
-        Entity e2 = world.Entity().Add<Pair, Velocity>();
-
-        using Query q = world.QueryBuilder()
-            .Expr("(Pair, Velocity)")
-            .Build();
-
-        int tableCount = 0;
-        int entityCount = 0;
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                tableCount++;
-                foreach (int i in it)
-                {
-                    Assert.True(it.Entity(i) == e2);
-                    entityCount++;
-                }
-            }
-        });
-
-        Assert.Equal(1, tableCount);
-        Assert.Equal(1, entityCount);
-    }
-
-    [Fact]
-    private void TagWithEach()
-    {
-        using World world = World.Create();
-
-        using Query q = world.QueryBuilder()
-            .With<Tag>()
-            .Build();
-
-        Entity e = world.Entity()
-            .Add<Tag>();
-
-        q.Each((Entity qe) => { Assert.True(qe == e); });
-    }
-
-    [Fact]
-    private void SharedTagWithEach()
-    {
-        using World world = World.Create();
-
-        using Query q = world.QueryBuilder()
-            .With<Tag>()
-            .Build();
-
-        Entity @base = world.Prefab()
-            .Add<Tag>();
-
-        Entity e = world.Entity()
-            .Add(Ecs.IsA, @base);
-
-        q.Each((Entity qe) => { Assert.True(qe == e); });
-    }
-
-    private static int ComparePosition(ulong e1, void* p1, ulong e2, void* p2)
-    {
-        Position* pos1 = (Position*)p1;
-        Position* pos2 = (Position*)p2;
-        return pos1->X.CompareTo(pos2->X);
-    }
-
-    [Fact]
-    private void SortBy()
-    {
-        using World world = World.Create();
-
-        world.Entity().Set(new Position(1, 0));
-        world.Entity().Set(new Position(6, 0));
-        world.Entity().Set(new Position(2, 0));
-        world.Entity().Set(new Position(5, 0));
-        world.Entity().Set(new Position(4, 0));
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .OrderBy<Position>(ComparePosition)
-            .Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Position> p = it.Field<Position>(0);
-                Assert.Equal(5, it.Count());
-                Assert.Equal(1, p[0].X);
-                Assert.Equal(2, p[1].X);
-                Assert.Equal(4, p[2].X);
-                Assert.Equal(5, p[3].X);
-                Assert.Equal(6, p[4].X);
-            }
-        });
-    }
-
-    [Fact]
-    private void Changed()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Set(new Position(1, 0));
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .Cached()
-            .Build();
-
-        using Query<Position> qW = world.Query<Position>();
-
-        Assert.True(q.Changed());
-
-        q.Each((ref Position _) => { });
-        Assert.False(q.Changed());
-
-        e.Set(new Position(2, 0));
-        Assert.True(q.Changed());
-
-        q.Each((ref Position _) => { });
-        Assert.False(q.Changed());
-
-        qW.Each((ref Position _) => { });
-        Assert.True(q.Changed());
-    }
-
-    [Fact]
-    private void DefaultCtor()
-    {
-        using World world = World.Create();
-
-        Query<Position> qVar;
-
-        int count = 0;
-        using Query<Position> q = world.Query<Position>();
-
-        world.Entity().Set(new Position(10, 20));
-
-        qVar = q;
-
-        qVar.Each((ref Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-            count++;
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void ExprWithTemplate()
-    {
-        using World world = World.Create();
-
-        Component<Template<int>> comp = world.Component<Template<int>>();
-        Assert.Equal("Template<System.Int32>", comp.Name());
-
-        int count = 0;
-        using Query<Position> q = world.QueryBuilder<Position>().Expr("Template<System.Int32>").Build();
-
-        world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Template<int>(30, 40));
-
-        q.Each((Entity e, ref Position p) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Template<int>* t = e.GetPtr<Template<int>>();
-            Assert.Equal(30, t->X);
-            Assert.Equal(40, t->Y);
-
-            count++;
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void QueryTypeWithTemplate()
-    {
-        using World world = World.Create();
-
-        Component<Template<int>> comp = world.Component<Template<int>>();
-        Assert.Equal("Template<System.Int32>", comp.Name());
-
-        int count = 0;
-        using Query<Position, Template<int>> q = world.Query<Position, Template<int>>();
-
-        world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Template<int>(30, 40));
-
-        q.Each((ref Position p, ref Template<int> t) =>
-        {
-            Assert.Equal(10, p.X);
-            Assert.Equal(20, p.Y);
-
-            Assert.Equal(30, t.X);
-            Assert.Equal(40, t.Y);
-
-            count++;
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void CompareTermId()
-    {
-        using World world = World.Create();
-
-        int count = 0;
-        Entity e = world.Entity().Add<Tag>();
-
-        using Query q = world.QueryBuilder()
-            .With<Tag>()
-            .Build();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Assert.True(it.Id(0) == it.World().Id<Tag>());
-                Assert.True(it.Entity(0) == e);
-            }
-
-            count++;
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    // [Fact]
-    // private void TestNoDeferEach()
-    // {
-    //     install_test_abort();
-    //
-    //     using World world = World.Create();
-    //
-    //     world.Entity().Add<Tag>().Set(new Value(10));
-    //
-    //     using var q = world.QueryBuilder<Value>()
-    //         .With<Tag>()
-    //         .Build();
-    //
-    //     q.Each((Entity e, ref Value v) =>
-    //     {
-    //         test_expect_abort();
-    //         e.Remove<Tag>();
-    //     });
-    //
-    //     Assert.True(false);
-    // }
-
-    // [Fact]
-    // private void TestNoDeferIter()
-    // {
-    //     install_test_abort();
-    //
-    //     using World world = World.Create();
-    //
-    //     world.Entity().Add<Tag>().Set(new Value(10));
-    //
-    //     using var q = world.QueryBuilder<Value>()
-    //         .With<Tag>()
-    //         .Build();
-    //
-    //     q.Run((Iter it, Field<Value> v) =>
-    //     {
-    //         foreach (int i in it)
-    //         {
-    //             test_expect_abort();
-    //             it.Entity(i).Remove<Tag>();
-    //         }
-    //     });
-    //
-    //     Assert.True(false);
-    // }
-
-    [Fact]
-    private void InspectTerms()
-    {
-        using World world = World.Create();
-
-        Entity p = world.Entity();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>()
-            .With(Ecs.ChildOf, p)
-            .Build();
-
-        Assert.Equal(3, q.FieldCount());
-
-        Term t = q.Term(0);
-        Assert.Equal(world.Id<Position>(), t.Id());
-        Assert.Equal(Ecs.And, t.Oper());
-        Assert.Equal(Ecs.InOutDefault, t.InOut());
-
-        t = q.Term(1);
-        Assert.Equal(world.Id<Velocity>(), t.Id());
-        Assert.Equal(Ecs.And, t.Oper());
-        Assert.Equal(Ecs.InOutDefault, t.InOut());
-
-        t = q.Term(2);
-        Assert.Equal(world.Pair(Ecs.ChildOf, p), t.Id());
-        Assert.Equal(Ecs.And, t.Oper());
-        Assert.Equal(Ecs.InOutDefault, t.InOut());
-        Assert.True(t.Id().Second() == p);
-    }
-
-    [Fact]
-    private void InspectTermsWithEach()
-    {
-        using World world = World.Create();
-
-        Entity p = world.Entity();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>()
-            .With(Ecs.ChildOf, p)
-            .Build();
-
-        int count = 0;
-        q.EachTerm((ref Term t) =>
-        {
-            if (count == 0)
-            {
-                Assert.Equal(world.Id<Position>(), t.Id());
-                Assert.Equal(Ecs.InOutDefault, t.InOut());
-            }
-            else if (count == 1)
-            {
-                Assert.Equal(world.Id<Velocity>(), t.Id());
-                Assert.Equal(Ecs.InOutDefault, t.InOut());
-            }
-            else if (count == 2)
-            {
-                Assert.Equal(world.Pair(Ecs.ChildOf, p), t.Id());
-                Assert.True(t.Id().Second() == p);
-                Assert.Equal(Ecs.InOutDefault, t.InOut());
-            }
-            else
-            {
-                Assert.True(false);
-            }
-
-            Assert.Equal(Ecs.And, t.Oper());
-
-            count++;
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void CompToStr()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>()
-            .Build();
-        Assert.Equal("Position($this), Velocity($this)", q.Str());
-    }
-
-    [Fact]
-    private void PairToStr()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>()
-            .With<Eats, Apples>()
-            .Build();
-        Assert.Equal("Position($this), Velocity($this), Eats($this,Apples)", q.Str());
-    }
-
-    [Fact]
-    private void OperNotToStr()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>().Oper(Ecs.Not)
-            .Build();
-        Assert.Equal("Position($this), !Velocity($this)", q.Str());
-    }
-
-    [Fact]
-    private void OperOptionalToStr()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>().Oper(Ecs.Optional)
-            .Build();
-        Assert.Equal("Position($this), ?Velocity($this)", q.Str());
-    }
-
-    [Fact]
-    private void OperOrToStr()
-    {
-        using World world = World.Create();
-
-        using Query q = world.QueryBuilder()
-            .With<Position>().Oper(Ecs.Or)
-            .With<Velocity>()
-            .Build();
-        Assert.Equal("Position($this) || Velocity($this)", q.Str());
-    }
-
-    [Fact]
-    private void EachNoEntity1Comp()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Position(1, 2));
-
-        using Query<Position> q = world.Query<Position>();
-
-        int count = 0;
-        q.Each((ref Position p) =>
-        {
-            Assert.Equal(1, p.X);
-            Assert.Equal(2, p.Y);
-            p.X += 1;
-            p.Y += 2;
-            count++;
-        });
-
-        Assert.Equal(1, count);
-
-        Position* pos = e.GetPtr<Position>();
-        Assert.Equal(2, pos->X);
-        Assert.Equal(4, pos->Y);
-    }
-
-    [Fact]
-    private void EachNoEntity2Comps()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity()
-            .Set(new Position(1, 2))
-            .Set(new Velocity(10, 20));
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        int count = 0;
-        q.Each((ref Position p, ref Velocity v) =>
-        {
-            Assert.Equal(1, p.X);
-            Assert.Equal(2, p.Y);
-            Assert.Equal(10, v.X);
-            Assert.Equal(20, v.Y);
-
-            p.X += 1;
-            p.Y += 2;
-            v.X += 1;
-            v.Y += 2;
-            count++;
-        });
-
-        Assert.Equal(1, count);
-
-        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
-        {
-            Assert.Equal(2, p.X);
-            Assert.Equal(4, p.Y);
-
-            Assert.Equal(11, v.X);
-            Assert.Equal(22, v.Y);
-        }));
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void IterNoComps1Comp()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>().Add<Velocity>();
-        world.Entity().Add<Velocity>();
-
-        using Query<Position> q = world.Query<Position>();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-                count += it.Count();
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void IterNoComps2Comps()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<Velocity>();
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>().Add<Velocity>();
-        world.Entity().Add<Position>().Add<Velocity>();
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-                count += it.Count();
-        });
-
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void IterNoCompsNoComps()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<Velocity>();
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>().Add<Velocity>();
-        world.Entity().Add<Position>().Add<Velocity>();
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .Build();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-                count += it.Count();
-        });
-
-        Assert.Equal(3, count);
-    }
-
-    [Fact]
-    private void IterQueryInSystem()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<Position>().Add<Velocity>();
-
-        using Query<Velocity> q = world.Query<Velocity>();
-
-        int count = 0;
-        world.System<Position>()
-            .Each((Entity _, ref Position _) => { q.Each((Entity _, ref Velocity _) => { count++; }); });
-
-        world.Progress();
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void IterType()
-    {
-        using World world = World.Create();
-
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>().Add<Velocity>();
-
-        using Query<Position> q = world.Query<Position>();
-
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Assert.True(it.Type().Count() >= 1);
-                Assert.True(it.Table().Has<Position>());
-            }
-        });
-    }
-
-    [Fact]
-    private void InstancedQueryWithSingletonEach()
-    {
-        using World world = World.Create();
-
-        world.Set(new Velocity(1, 2));
-
-        Entity e1 = world.Entity().Set(new Position(10, 20));
-        e1.Set(new Self(e1));
-        Entity e2 = world.Entity().Set(new Position(20, 30));
-        e2.Set(new Self(e2));
-        Entity e3 = world.Entity().Set(new Position(30, 40));
-        e3.Set(new Self(e3));
-        Entity e4 = world.Entity().Set(new Position(40, 50));
-        e4.Set(new Self(e4));
-        Entity e5 = world.Entity().Set(new Position(50, 60));
-        e5.Set(new Self(e5));
-
-        e4.Add<Tag>();
-        e5.Add<Tag>();
-
-        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
-            .TermAt(2).Singleton()
-            .Build();
-
-        int count = 0;
-        q.Each((Entity e, ref Self s, ref Position p, ref Velocity v) =>
-        {
-            Assert.True(e == s.Value);
-            p.X += v.X;
-            p.Y += v.Y;
-            count++;
-        });
-
-        Assert.Equal(5, count);
-
-        Assert.True(e1.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(11, p.X);
-            Assert.Equal(22, p.Y);
-        }));
-
-        Assert.True(e2.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(21, p.X);
-            Assert.Equal(32, p.Y);
-        }));
-
-        Assert.True(e3.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(31, p.X);
-            Assert.Equal(42, p.Y);
-        }));
-
-        Assert.True(e4.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(41, p.X);
-            Assert.Equal(52, p.Y);
-        }));
-
-        Assert.True(e5.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(51, p.X);
-            Assert.Equal(62, p.Y);
-        }));
-    }
-
-    [Fact]
-    private void InstancedQueryWithBaseEach()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity().Set(new Velocity(1, 2));
-
-        Entity e1 = world.Entity().IsA(@base).Set(new Position(10, 20));
-        e1.Set(new Self(e1));
-        Entity e2 = world.Entity().IsA(@base).Set(new Position(20, 30));
-        e2.Set(new Self(e2));
-        Entity e3 = world.Entity().IsA(@base).Set(new Position(30, 40));
-        e3.Set(new Self(e3));
-        Entity e4 = world.Entity().IsA(@base).Set(new Position(40, 50)).Add<Tag>();
-        e4.Set(new Self(e4));
-        Entity e5 = world.Entity().IsA(@base).Set(new Position(50, 60)).Add<Tag>();
-        e5.Set(new Self(e5));
-        Entity e6 = world.Entity().Set(new Position(60, 70)).Set(new Velocity(2, 3));
-        e6.Set(new Self(e6));
-        Entity e7 = world.Entity().Set(new Position(70, 80)).Set(new Velocity(4, 5));
-        e7.Set(new Self(e7));
-
-        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
-            .Build();
-
-        int count = 0;
-        q.Each((Entity e, ref Self s, ref Position p, ref Velocity v) =>
-        {
-            Assert.True(e == s.Value);
-            p.X += v.X;
-            p.Y += v.Y;
-            count++;
-        });
-
-        Assert.Equal(7, count);
-
-        Assert.True(e1.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(11, p.X);
-            Assert.Equal(22, p.Y);
-        }));
-
-        Assert.True(e2.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(21, p.X);
-            Assert.Equal(32, p.Y);
-        }));
-
-        Assert.True(e3.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(31, p.X);
-            Assert.Equal(42, p.Y);
-        }));
-
-        Assert.True(e4.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(41, p.X);
-            Assert.Equal(52, p.Y);
-        }));
-
-        Assert.True(e5.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(51, p.X);
-            Assert.Equal(62, p.Y);
-        }));
-
-        Assert.True(e6.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(62, p.X);
-            Assert.Equal(73, p.Y);
-        }));
-
-        Assert.True(e7.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(74, p.X);
-            Assert.Equal(85, p.Y);
-        }));
-    }
-
-    [Fact]
-    private void InstancedQueryWithSingletonIter()
-    {
-        using World world = World.Create();
-
-        world.Set(new Velocity(1, 2));
-
-        Entity e1 = world.Entity().Set(new Position(10, 20));
-        e1.Set(new Self(e1));
-        Entity e2 = world.Entity().Set(new Position(20, 30));
-        e2.Set(new Self(e2));
-        Entity e3 = world.Entity().Set(new Position(30, 40));
-        e3.Set(new Self(e3));
-        Entity e4 = world.Entity().Set(new Position(40, 50));
-        e4.Set(new Self(e4));
-        Entity e5 = world.Entity().Set(new Position(50, 60));
-        e5.Set(new Self(e5));
-
-        e4.Add<Tag>();
-        e5.Add<Tag>();
-
-        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
-            .TermAt(2).Singleton()
-            .Build();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Self> s = it.Field<Self>(0);
-                Field<Position> p = it.Field<Position>(1);
-                Field<Velocity> v = it.Field<Velocity>(2);
-
-                Assert.True(it.Count() > 1);
-
-                foreach (int i in it)
-                {
-                    p[i].X += v[0].X;
-                    p[i].Y += v[0].Y;
-                    Assert.True(it.Entity(i) == s[i].Value);
-                    count++;
-                }
-            }
-        });
-
-        Assert.Equal(5, count);
-
-        Assert.True(e1.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(11, p.X);
-            Assert.Equal(22, p.Y);
-        }));
-
-        Assert.True(e2.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(21, p.X);
-            Assert.Equal(32, p.Y);
-        }));
-
-        Assert.True(e3.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(31, p.X);
-            Assert.Equal(42, p.Y);
-        }));
-
-        Assert.True(e4.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(41, p.X);
-            Assert.Equal(52, p.Y);
-        }));
-
-        Assert.True(e5.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(51, p.X);
-            Assert.Equal(62, p.Y);
-        }));
-    }
-
-    [Fact]
-    private void InstancedQueryWithBaseIter()
-    {
-        using World world = World.Create();
-
-        Entity @base = world.Entity().Set(new Velocity(1, 2));
-
-        Entity e1 = world.Entity().IsA(@base).Set(new Position(10, 20));
-        e1.Set(new Self(e1));
-        Entity e2 = world.Entity().IsA(@base).Set(new Position(20, 30));
-        e2.Set(new Self(e2));
-        Entity e3 = world.Entity().IsA(@base).Set(new Position(30, 40));
-        e3.Set(new Self(e3));
-        Entity e4 = world.Entity().IsA(@base).Set(new Position(40, 50)).Add<Tag>();
-        e4.Set(new Self(e4));
-        Entity e5 = world.Entity().IsA(@base).Set(new Position(50, 60)).Add<Tag>();
-        e5.Set(new Self(e5));
-        Entity e6 = world.Entity().Set(new Position(60, 70)).Set(new Velocity(2, 3));
-        e6.Set(new Self(e6));
-        Entity e7 = world.Entity().Set(new Position(70, 80)).Set(new Velocity(4, 5));
-        e7.Set(new Self(e7));
-
-        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
-            .Build();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Field<Self> s = it.Field<Self>(0);
-                Field<Position> p = it.Field<Position>(1);
-                Field<Velocity> v = it.Field<Velocity>(2);
-
-                Assert.True(it.Count() > 1);
-
-                foreach (int i in it)
-                {
-                    if (it.IsSelf(2))
-                    {
-                        p[i].X += v[i].X;
-                        p[i].Y += v[i].Y;
-                    }
-                    else
-                    {
-                        p[i].X += v[0].X;
-                        p[i].Y += v[0].Y;
-                    }
-
-                    Assert.True(it.Entity(i) == s[i].Value);
-                    count++;
-                }
-            }
-        });
-
-        Assert.Equal(7, count);
-
-        Assert.True(e1.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(11, p.X);
-            Assert.Equal(22, p.Y);
-        }));
-
-        Assert.True(e2.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(21, p.X);
-            Assert.Equal(32, p.Y);
-        }));
-
-        Assert.True(e3.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(31, p.X);
-            Assert.Equal(42, p.Y);
-        }));
-
-        Assert.True(e4.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(41, p.X);
-            Assert.Equal(52, p.Y);
-        }));
-
-        Assert.True(e5.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(51, p.X);
-            Assert.Equal(62, p.Y);
-        }));
-
-        Assert.True(e6.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(62, p.X);
-            Assert.Equal(73, p.Y);
-        }));
-
-        Assert.True(e7.Read((ref readonly Position p) =>
-        {
-            Assert.Equal(74, p.X);
-            Assert.Equal(85, p.Y);
-        }));
-    }
-
-    [Fact]
-    private void QueryEachFromComponent()
-    {
-        using World world = World.Create();
-
-        world.Entity().Set(new Position()).Set(new Velocity());
-        world.Entity().Set(new Position()).Set(new Velocity());
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-        Entity e = world.Entity().Set(new QueryWrapper(q));
-
-        QueryWrapper* qc = e.GetPtr<QueryWrapper>();
-        Assert.True(qc != null);
-
-        int count = 0;
-        qc->Query.Each((Entity _, ref Position _, ref Velocity _) => { count++; });
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void QueryIterFromComponent()
-    {
-        using World world = World.Create();
-
-        world.Entity().Set(new Position()).Set(new Velocity());
-        world.Entity().Set(new Position()).Set(new Velocity());
-
-        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
-        Entity e = world.Entity().Set(new QueryWrapper(q));
-
-        QueryWrapper* qc = e.GetPtr<QueryWrapper>();
-        Assert.True(qc != null);
-
-        int count = 0;
-        qc->Query.Run((Iter it) =>
-        {
-            while (it.Next())
-                count += it.Count();
-        });
-        Assert.Equal(2, count);
-    }
-
-    private static void EachFunc(Entity e, ref Position p)
-    {
-        InvokedCount++;
-        p.X++;
-        p.Y++;
-    }
-
-    private static void IterFunc(Iter it, Field<Position> p)
-    {
-        Assert.Equal(1, it.Count());
-        InvokedCount++;
-        p[0].X++;
-        p[0].Y++;
-    }
-
-    [Fact]
-    private void QueryEachWithFuncPtr()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Set(new Position(10, 20));
-
-        using Query<Position> q = world.Query<Position>();
-
-        q.Each(&EachFunc);
-
-        Assert.Equal(1, InvokedCount);
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(11, ptr->X);
-        Assert.Equal(21, ptr->Y);
-    }
-
-    [Fact]
-    private void QueryIterWithFuncPtr()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Set(new Position(10, 20));
-
-        using Query<Position> q = world.Query<Position>();
-
-        q.Iter(&IterFunc);
-
-        Assert.Equal(1, InvokedCount);
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(11, ptr->X);
-        Assert.Equal(21, ptr->Y);
-    }
-
-    [Fact]
-    private void QueryEachWithFuncNoPtr()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Set(new Position(10, 20));
-
-        using Query<Position> q = world.Query<Position>();
-
-        q.Each(EachFunc);
-
-        Assert.Equal(1, InvokedCount);
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(11, ptr->X);
-        Assert.Equal(21, ptr->Y);
-    }
-
-    [Fact]
-    private void QueryIterWithFuncNoPtr()
-    {
-        using World world = World.Create();
-
-        Entity e = world.Entity().Set(new Position(10, 20));
-
-        using Query<Position> q = world.Query<Position>();
-
-        q.Iter(IterFunc);
-
-        Assert.Equal(1, InvokedCount);
-
-        Position* ptr = e.GetPtr<Position>();
-        Assert.Equal(11, ptr->X);
-        Assert.Equal(21, ptr->Y);
-    }
-
-    [Fact]
-    private void QueryEachWithIter()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity();
-        e1.Set(new Self(e1));
-        e1.Set(new Position(10, 20));
-        Entity e2 = world.Entity();
-        e2.Set(new Self(e2));
-        e2.Set(new Position(20, 30));
-
-        using Query<Self, Position> q = world.Query<Self, Position>();
-
-        int invoked = 0;
-        q.Each((Iter it, int i, ref Self s, ref Position p) =>
-        {
-            Assert.Equal(2, it.Count());
-            Assert.Equal(s.Value, it.Entity(i));
-            p.X++;
-            p.Y++;
-            invoked++;
-        });
-
-        Assert.Equal(2, invoked);
-
-        Position* ptr = e1.GetPtr<Position>();
-        Assert.Equal(11, ptr->X);
-        Assert.Equal(21, ptr->Y);
-
-        ptr = e2.GetPtr<Position>();
-        Assert.Equal(21, ptr->X);
-        Assert.Equal(31, ptr->Y);
-    }
-
-    // [Fact]
-    // private void InvalidFieldFromEachWithIter()
-    // {
-    //     install_test_abort();
-    //
-    //     using World world = World.Create();
-    //
-    //     world.Entity()
-    //         .Set(new Position(10, 20))
-    //         .Set(new Velocity(1, 2));
-    //
-    //     using var q = world.QueryBuilder<Position>()
-    //         .With<Velocity>().InOut()
-    //         .Build();
-    //
-    //     test_expect_abort();
-    //
-    //     q.Each((Iter it, int index, ref Position p) => { it.Field(1); });
-    // }
-
-    // [Fact]
-    // private void InvalidFieldTFromEachWithIter()
-    // {
-    //     install_test_abort();
-    //
-    //     using World world = World.Create();
-    //
-    //     world.Entity()
-    //         .Set(new Position(10, 20))
-    //         .Set(new Velocity(1, 2));
-    //
-    //     using var q = world.QueryBuilder<Position>()
-    //         .With<Velocity>().InOut()
-    //         .Build();
-    //
-    //     test_expect_abort();
-    //
-    //     q.Each((Iter it, int index, ref Position p) => { it.Field<Velocity>(1); });
-    // }
-
-    // [Fact]
-    // private void InvalidFieldConstTFromEachWithIter()
-    // {
-    //     install_test_abort();
-    //
-    //     using World world = World.Create();
-    //
-    //     world.Entity()
-    //         .Set(new Position(10, 20))
-    //         .Set(new Velocity(1, 2));
-    //
-    //     using var q = world.QueryBuilder<Position>()
-    //         .With<Velocity>().InOut()
-    //         .Build();
-    //
-    //     test_expect_abort();
-    //
-    //     q.Each((Iter it, int index, ref Position p) => { it.Field<Velocity>(1); });
-    // }
-
-    // [Fact]
-    // private void FieldAtFromEachWithIter()
-    // {
-    //     using World world = World.Create();
-    //
-    //     Entity e1 = world.Entity()
-    //         .Set(new Position(10, 20))
-    //         .Set(new Velocity(1, 2));
-    //
-    //     Entity e2 = world.Entity()
-    //         .Set(new Position(20, 30))
-    //         .Set(new Velocity(3, 4));
-    //
-    //     using var q = world.QueryBuilder<Position>()
-    //         .With<Velocity>().InOut()
-    //         .Build();
-    //
-    //     int count = 0;
-    //
-    //     q.Each((Iter it, int row, ref Position p) =>
-    //     {
-    //         Velocity* v = (Velocity*)it.FieldAt(1, row);
-    //         if (it.Entity(row) == e1)
-    //         {
-    //             Assert.Equal(1, v->X);
-    //             Assert.Equal(2, v->Y);
-    //             count++;
-    //         }
-    //         else if (it.Entity(row) == e2)
-    //         {
-    //             Assert.Equal(3, v->X);
-    //             Assert.Equal(4, v->Y);
-    //             count++;
-    //         }
-    //     });
-    //
-    //     Assert.Equal(2, count);
-    // }
-
-    [Fact]
-    private void FieldAtTFromEachWithIter()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(20, 30))
-            .Set(new Velocity(3, 4));
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>().InOut()
-            .Build();
-
-        int count = 0;
-
-        q.Each((Iter it, int row, ref Position _) =>
-        {
-            ref Velocity v = ref it.FieldAt<Velocity>(1, row);
-            if (it.Entity(row) == e1)
-            {
-                Assert.Equal(1, v.X);
-                Assert.Equal(2, v.Y);
-                count++;
-            }
-            else if (it.Entity(row) == e2)
-            {
-                Assert.Equal(3, v.X);
-                Assert.Equal(4, v.Y);
-                count++;
-            }
-        });
-
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void FieldAtConstTFromEachWithIter()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(20, 30))
-            .Set(new Velocity(3, 4));
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With<Velocity>().InOut()
-            .Build();
-
-        int count = 0;
-
-        q.Each((Iter it, int row, ref Position _) =>
-        {
-            ref Velocity v = ref it.FieldAt<Velocity>(1, row);
-            if (it.Entity(row) == e1)
-            {
-                Assert.Equal(1, v.X);
-                Assert.Equal(2, v.Y);
-                count++;
-            }
-            else if (it.Entity(row) == e2)
-            {
-                Assert.Equal(3, v.X);
-                Assert.Equal(4, v.Y);
-                count++;
-            }
-        });
-
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void ChangeTracking()
-    {
-        using World world = World.Create();
-
-        using Query<Position> qw = world.Query<Position>();
-        using Query<Position> qr = world.QueryBuilder<Position>()
-            .Cached()
-            .Build();
-
-        Entity e1 = world.Entity().Add<Tag>().Set(new Position(10, 20));
-        world.Entity().Set(new Position(20, 30));
-
-        Assert.True(qr.Changed());
-        qr.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-            }
-        });
-        Assert.False(qr.Changed());
-
-        int count = 0, changeCount = 0;
-
-        qw.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Assert.Equal(1, it.Count());
-
-                count++;
-
-                if (it.Entity(0) == e1)
-                {
-                    it.Skip();
-                    continue;
-                }
-
-                changeCount++;
-            }
-        });
-
-        Assert.Equal(2, count);
-        Assert.Equal(1, changeCount);
-
-        count = 0;
-        changeCount = 0;
-
-        Assert.True(qr.Changed());
-
-        qr.Run((Iter it) =>
-        {
-            while (it.Next())
-            {
-                Assert.Equal(1, it.Count());
-
-                count++;
-
-                if (it.Entity(0) == e1)
-                {
-                    Assert.False(it.Changed());
-                }
-                else
-                {
-                    Assert.True(it.Changed());
-                    changeCount++;
-                }
-            }
-        });
-
-        Assert.Equal(2, count);
-        Assert.Equal(1, changeCount);
-    }
-
-    [Fact]
-    private void NotWithWrite()
-    {
-        using World world = World.Create();
-
-        using Query q = world.QueryBuilder()
-            .With<A>()
-            .With<B>().Oper(Ecs.Not).Write()
-            .Build();
-
-        Entity e = world.Entity().Add<A>();
-
-        int count = 0;
-        world.Defer(() =>
-        {
-            q.Each((Entity ent) =>
-            {
-                ent.Add<B>();
-                count++;
-            });
-        });
-
-        Assert.Equal(1, count);
-        Assert.True(e.Has<B>());
-
-        q.Each((Entity _) => { count++; });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void InstancedNestedQueryWithIter()
-    {
-        using World world = World.Create();
-
-        using Query q1 = world.QueryBuilder()
-            .With<Position>()
-            .With<Mass>().Singleton().InOut()
-            .Build();
-
-        using Query q2 = world.QueryBuilder()
-            .With<Velocity>()
-            .Build();
-
-        world.Add<Mass>();
-        world.Entity().Add<Velocity>();
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>();
-
-        int count = 0;
-
-        q2.Run((Iter it2) =>
-        {
-            while (it2.Next())
-            {
-                q1.Iter(it2).Run((Iter it1) =>
-                {
-                    while (it1.Next())
-                    {
-                        Assert.Equal(2, it1.Count());
-                        count += it1.Count();
-                    }
-                });
-            }
-        });
-
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void InstancedNestedQueryWithEntity()
-    {
-        using World world = World.Create();
-
-        using Query q1 = world.QueryBuilder()
-            .With<Position>()
-            .With<Mass>().Singleton().InOut()
-            .Build();
-
-        using Query q2 = world.QueryBuilder()
-            .With<Velocity>()
-            .Build();
-
-        world.Add<Mass>();
-        world.Entity().Add<Velocity>();
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>();
-
-        int count = 0;
-
-        q2.Each((Entity e2) =>
-        {
-            q1.Iter(e2).Run((Iter it1) =>
-            {
-                while (it1.Next())
-                {
-                    Assert.Equal(2, it1.Count());
-                    count += it1.Count();
-                }
-            });
-        });
-
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void InstancedNestedQueryWithWorld()
-    {
-        using World world = World.Create();
-
-        using Query q1 = world.QueryBuilder()
-            .With<Position>()
-            .With<Mass>().Singleton().InOut()
-            .Build();
-
-        using Query q2 = world.QueryBuilder()
-            .With<Velocity>()
-            .Build();
-
-        world.Add<Mass>();
-        world.Entity().Add<Velocity>();
-        world.Entity().Add<Position>();
-        world.Entity().Add<Position>();
-
-        int count = 0;
-
-        q2.Run((Iter it2) =>
-        {
-            while (it2.Next())
-            {
-                q1.Iter(it2.World()).Run((Iter it1) =>
-                {
-                    while (it1.Next())
-                    {
-                        Assert.Equal(2, it1.Count());
-                        count += it1.Count();
-                    }
-                });
-            }
-        });
-
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void CapturedQuery()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.Query<Position>();
-        Entity e1 = world.Entity().Set(new Position(10, 20));
-
-        Action action = () =>
-        {
-            int count = 0;
-            q.Each((Entity e, ref Position p) =>
-            {
-                Assert.True(e == e1);
-                Assert.Equal(10, p.X);
-                Assert.Equal(20, p.Y);
-                count++;
-            });
-            Assert.Equal(1, count);
-        };
-
-        action();
-    }
-
-    [Fact]
-    private void PageIterCapturedQuery()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.Query<Position>();
-        world.Entity().Set(new Position(10, 20));
-        Entity e2 = world.Entity().Set(new Position(20, 30));
-        world.Entity().Set(new Position(10, 20));
-
-        Action action = () =>
-        {
-            int count = 0;
-            q.Iter().Page(1, 1).Each((Entity e, ref Position p) =>
-            {
-                Assert.True(e == e2);
-                Assert.Equal(20, p.X);
-                Assert.Equal(30, p.Y);
-                count++;
-            });
-            Assert.Equal(1, count);
-        };
-
-        action();
-    }
-
-    [Fact]
-    private void WorkerIterCapturedQuery()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.Query<Position>();
-        world.Entity().Set(new Position(10, 20));
-        Entity e2 = world.Entity().Set(new Position(20, 30));
-        world.Entity().Set(new Position(10, 20));
-
-        Action action = () =>
-        {
-            int count = 0;
-            q.Iter().Worker(1, 3).Each((Entity e, ref Position p) =>
-            {
-                Assert.True(e == e2);
-                Assert.Equal(20, p.X);
-                Assert.Equal(30, p.Y);
-                count++;
-            });
-            Assert.Equal(1, count);
-        };
-
-        action();
-    }
-
-    [Fact]
-    private void SetGroupCapturedQuery()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Entity tgtA = world.Entity();
-        Entity tgtB = world.Entity();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .GroupBy(rel)
-            .Build();
-
-        world.Entity().Set(new Position(10, 20)).Add(rel, tgtA);
-        Entity e2 = world.Entity().Set(new Position(20, 30)).Add(rel, tgtB);
-
-        new Action(() =>
-        {
-            int count = 0;
-            q.SetGroup(tgtB).Each((Entity e, ref Position p) =>
-            {
-                Assert.True(e == e2);
-                Assert.Equal(20, p.X);
-                Assert.Equal(30, p.Y);
-                count++;
-            });
-            Assert.Equal(1, count);
-        })();
-    }
-
-    [Fact]
-    private void SetVarCapturedQuery()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Entity tgtA = world.Entity();
-        Entity tgtB = world.Entity();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With(rel, "$var")
-            .Build();
-
-        world.Entity().Set(new Position(10, 20)).Add(rel, tgtA);
-        Entity e2 = world.Entity().Set(new Position(20, 30)).Add(rel, tgtB);
-
-        new Action(() =>
-        {
-            int count = 0;
-            q.SetVar("var", tgtB).Each((Entity e, ref Position p) =>
-            {
-                Assert.True(e == e2);
-                Assert.Equal(20, p.X);
-                Assert.Equal(30, p.Y);
-                count++;
-            });
-            Assert.Equal(1, count);
-        })();
-    }
-
-    [Fact]
-    private void SetVarIdCapturedQuery()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Entity tgtA = world.Entity();
-        Entity tgtB = world.Entity();
-
-        using Query<Position> q = world.QueryBuilder<Position>()
-            .With(rel, "$var")
-            .Build();
-
-        int var = q.FindVar("var");
-        Assert.True(var != -1);
-
-        world.Entity().Set(new Position(10, 20)).Add(rel, tgtA);
-        Entity e2 = world.Entity().Set(new Position(20, 30)).Add(rel, tgtB);
-
-        new Action(() =>
-        {
-            int count = 0;
-            q.SetVar(var, tgtB).Each((Entity e, ref Position p) =>
-            {
-                Assert.True(e == e2);
-                Assert.Equal(20, p.X);
-                Assert.Equal(30, p.Y);
-                count++;
-            });
-            Assert.Equal(1, count);
-        })();
-    }
-
-    [Fact]
-    private void IterEntities()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity().Set(new Position(10, 20));
-        Entity e2 = world.Entity().Set(new Position(10, 20));
-        Entity e3 = world.Entity().Set(new Position(10, 20));
-
-        world.Query<Position>()
-            .Run((Iter it) =>
-            {
-                while (it.Next())
-                {
-                    Assert.Equal(3, it.Count());
-
-                    Field<ulong> entities = it.Entities();
-                    Assert.True(entities[0] == e1);
-                    Assert.True(entities[1] == e2);
-                    Assert.True(entities[2] == e3);
-                }
-            });
-    }
-
-    [Fact]
-    private void IterGetPairWithId()
-    {
-        using World world = World.Create();
-
-        Entity rel = world.Entity();
-        Entity tgt = world.Entity();
-        Entity e = world.Entity().Add(rel, tgt);
-
-        using Query q = world.QueryBuilder()
-            .With(rel, Ecs.Wildcard)
-            .Build();
-
-        int count = 0;
-
-        q.Each((Iter it, int i) =>
-        {
-            Assert.True(it.Id(0).IsPair());
-            Assert.True(it.Id(0).First() == rel);
-            Assert.True(it.Id(0).Second() == tgt);
-            Assert.True(e == it.Entity(i));
-            count++;
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void QueryFromEntity()
-    {
-        using World world = World.Create();
-
-        Entity qe = world.Entity();
-        using Query<Position, Velocity> q1 = world.QueryBuilder<Position, Velocity>(qe)
-            .Build();
-
-        world.Entity().Add<Position>();
-        Entity e2 = world.Entity().Add<Position>().Add<Velocity>();
-
-        int count = 0;
-        q1.Each((Entity e, ref Position _, ref Velocity _) =>
-        {
-            count++;
-            Assert.True(e == e2);
-        });
-        Assert.Equal(1, count);
-
-        Query q2 = world.Query(qe);
-        q2.Each((Entity e) =>
-        {
-            count++;
-            Assert.True(e == e2);
-        });
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void QueryFromEntityName()
-    {
-        using World world = World.Create();
-
-        using Query<Position, Velocity> q1 = world.QueryBuilder<Position, Velocity>("qe")
-            .Build();
-
-        world.Entity().Add<Position>();
-        Entity e2 = world.Entity().Add<Position>().Add<Velocity>();
-
-        int count = 0;
-        q1.Each((Entity e, ref Position _, ref Velocity _) =>
-        {
-            count++;
-            Assert.True(e == e2);
-        });
-        Assert.Equal(1, count);
-
-        Query q2 = world.Query("qe");
-        q2.Each((Entity e) =>
-        {
-            count++;
-            Assert.True(e == e2);
-        });
-        Assert.Equal(2, count);
-    }
-
-    [Fact]
-    private void RunWithIterFini()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q1 = world.Query<Position>();
-
-        int count = 0;
-        q1.Run((Iter it) =>
-        {
-            it.Fini();
-            count++;
-        });
-
-        Assert.Equal(1, count);
-    }
-
-
-    [Fact]
-    private void RunWithIterFiniInterrupt()
-    {
-        using World world = World.Create();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Add<Foo>();
-        world.Entity()
-            .Set(new Position(10, 20))
-            .Add<Bar>();
-        world.Entity()
-            .Set(new Position(10, 20))
-            .Add<Hello>();
-
-        using Query<Position> q = world.Query<Position>();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            Assert.True(it.Next());
-            Assert.Equal(1, it.Count());
-            Assert.Equal(e1, it.Entity(0));
-
-            Assert.True(it.Next());
-            count++;
-            it.Fini();
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void RunWithIterFiniEmpty()
-    {
-        using World world = World.Create();
-
-        using Query<Position> q = world.Query<Position>();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            count++;
-            it.Fini();
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void RunWithIterFiniNoQuery()
-    {
-        using World world = World.Create();
-
-        using Query q = world.Query();
-
-        int count = 0;
-        q.Run((Iter it) =>
-        {
-            count++;
-            it.Fini();
-        });
-
-        Assert.Equal(1, count);
-    }
-
-    [Fact]
-    private void AddToMatchFromStagedQuery()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity e = world.Entity().Add<Position>();
-
-        World stage = world.GetStage(0);
-
-        world.ReadonlyBegin(false);
-
-        stage.Query<Position>()
-            .Each((Entity e, ref Position _) =>
-            {
-                e.Add<Velocity>();
-                Assert.True(!e.Has<Velocity>());
-            });
-
-        world.ReadonlyEnd();
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-    }
-
-    [Fact]
-    private void AddToMatchFromStagedQueryReadonlyThreaded()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-
-        Entity e = world.Entity().Add<Position>();
-
-        World stage = world.GetStage(0);
-
-        world.ReadonlyBegin(true);
-
-        stage.Query<Position>()
-            .Each((Entity e, ref Position _) =>
-            {
-                e.Add<Velocity>();
-                Assert.True(!e.Has<Velocity>());
-            });
-
-        world.ReadonlyEnd();
-
-        Assert.True(e.Has<Position>());
-        Assert.True(e.Has<Velocity>());
-    }
-
-    [Fact]
-    private void EmptyTablesEach()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-        world.Component<Tag>();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(20, 30))
-            .Set(new Velocity(2, 3));
-
-        e2.Add<Tag>();
-        e2.Remove<Tag>();
-
-        using Query<Position, Velocity> q = world.QueryBuilder<Position, Velocity>()
-            .QueryFlags(EcsQueryMatchEmptyTables)
-            .Build();
-
-        q.Each((ref Position p, ref Velocity v) =>
-        {
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        {
-            Position* p = e1.GetPtr<Position>();
-            Assert.Equal(11, p->X);
-            Assert.Equal(22, p->Y);
-        }
-        {
-            Position* p = e2.GetPtr<Position>();
-            Assert.Equal(22, p->X);
-            Assert.Equal(33, p->Y);
-        }
-    }
-
-    // TODO: Fix later
-    // [Fact]
-    // private void EmptyTablesEachWithEntity()
-    // {
-    //     using World world = World.Create();
-    //
-    //     world.Component<Position>();
-    //     world.Component<Velocity>();
-    //     world.Component<Tag>();
-    //
-    //     Entity e1 = world.Entity()
-    //         .Set(new Position(10, 20))
-    //         .Set(new Velocity(1, 2));
-    //
-    //     Entity e2 = world.Entity()
-    //         .Set(new Position(20, 30))
-    //         .Set(new Velocity(2, 3));
-    //
-    //     e2.Add<Tag>();
-    //     e2.Remove<Tag>();
-    //
-    //     using var q = world.QueryBuilder<Position, Velocity>()
-    //         .QueryFlags(EcsQueryMatchEmptyTables)
-    //         .Build();
-    //
-    //     q.Each((Entity e, ref Position p, ref Velocity v) =>
-    //     {
-    //         p.X += v.X;
-    //         p.Y += v.Y;
-    //     });
-    //
-    //     {
-    //         Position* p = e1.GetPtr<Position>();
-    //         Assert.Equal(11, p->X);
-    //         Assert.Equal(22, p->Y);
-    //     }
-    //     {
-    //         Position* p = e2.GetPtr<Position>();
-    //         Assert.Equal(22, p->X);
-    //         Assert.Equal(33, p->Y);
-    //     }
-    // }
-
-    [Fact]
-    private void EmptyTablesEachWithIter()
-    {
-        using World world = World.Create();
-
-        world.Component<Position>();
-        world.Component<Velocity>();
-        world.Component<Tag>();
-
-        Entity e1 = world.Entity()
-            .Set(new Position(10, 20))
-            .Set(new Velocity(1, 2));
-
-        Entity e2 = world.Entity()
-            .Set(new Position(20, 30))
-            .Set(new Velocity(2, 3));
-
-        e2.Add<Tag>();
-        e2.Remove<Tag>();
-
-        using Query<Position, Velocity> q = world.QueryBuilder<Position, Velocity>()
-            .QueryFlags(EcsQueryMatchEmptyTables)
-            .Build();
-
-        q.Each((Iter _, int _, ref Position p, ref Velocity v) =>
-        {
-            p.X += v.X;
-            p.Y += v.Y;
-        });
-
-        {
-            Position* p = e1.GetPtr<Position>();
-            Assert.Equal(11, p->X);
-            Assert.Equal(22, p->Y);
-        }
-        {
-            Position* p = e2.GetPtr<Position>();
-            Assert.Equal(22, p->X);
-            Assert.Equal(33, p->Y);
-        }
-    }
-
-    [Fact]
-    private void PairWithVariableSrc()
-    {
-        using World world = World.Create();
-
-        world.Component<RelData>();
-        world.Component<ThisComp>();
-        world.Component<OtherComp>();
-
-        Entity other = world.Entity()
-            .Set(new OtherComp(10));
-
-        for (int i = 0; i < 3; i++)
-            world.Entity()
-                .Set(new ThisComp(i))
-                .Add<RelData>(other);
-
-        using Query<RelData, ThisComp, OtherComp> q = world.QueryBuilder<RelData, ThisComp, OtherComp>()
-            .TermAt(0).Second("$other")
-            .TermAt(2).Src("$other")
-            .Build();
-
-        int isPresent = 0;
-        q.Each((ref RelData _, ref ThisComp thisComp, ref OtherComp otherComp) =>
-        {
-            isPresent |= 1 << thisComp.X;
-            Assert.Equal(10, otherComp.X);
-        });
-
-        Assert.Equal(7, isPresent);
-    }
-
-    [Fact]
-    private void PairWithVariableSrcNoRowFields()
-    {
-        using World world = World.Create();
-
-        world.Component<RelData>();
-        world.Component<ThisComp>();
-        world.Component<OtherComp>();
-
-        Entity other = world.Entity()
-            .Set(new OtherComp(0));
-
-        world.Entity()
-            .Set(new OtherComp(1));
-
-        for (int i = 0; i < 3; i++)
-            world.Entity()
-                .Set(new ThisComp(i))
-                .Add<RelData>(other);
-
-        using Query<RelData, ThisComp, OtherComp> q = world.QueryBuilder<RelData, ThisComp, OtherComp>()
-            .TermAt(0).Second("$other")
-            .TermAt(2).Src("$other")
-            .Build();
-
-        int isPresent = 0;
-        q.Each((ref RelData _, ref ThisComp thisComp, ref OtherComp otherComp) =>
-        {
-            isPresent |= 1 << thisComp.X;
-            Assert.Equal(0, otherComp.X);
-        });
-
-        Assert.Equal(7, isPresent);
-    }
-
-    [Fact]
-    private void IterTargets()
-    {
-        using World world = World.Create();
-
-        Entity likes = world.Entity();
-        Entity pizza = world.Entity();
-        Entity salad = world.Entity();
-        Entity alice = world.Entity()
-            .Add(likes, pizza)
-            .Add(likes, salad);
-
-        using Query q = world.QueryBuilder()
-            .With(likes, Ecs.Any)
-            .Build();
-
-        int count = 0;
-        int tgtCount = 0;
-
-        q.Each((Iter it, int row) =>
-        {
-            Entity e = it.Entity(row);
-            Assert.True(e == alice);
-
-            it.Targets(0, (Entity tgt) =>
-            {
-                if (tgtCount == 0)
-                    Assert.True(tgt == pizza);
-                if (tgtCount == 1)
-                    Assert.True(tgt == salad);
-                tgtCount++;
-            });
-
-            count++;
-        });
-
-        Assert.Equal(1, count);
-        Assert.Equal(2, tgtCount);
-    }
-
-    [Fact]
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    private void IterTargets2ndField()
-    {
-        using World world = World.Create();
-
-        Entity likes = world.Entity();
-        Entity pizza = world.Entity();
-        Entity salad = world.Entity();
-        Entity alice = world.Entity()
-            .Add<Position>()
-            .Add(likes, pizza)
-            .Add(likes, salad);
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With(likes, Ecs.Any)
-            .Build();
-
-        int count = 0;
-        int tgtCount = 0;
-
-        q.Each((Iter it, int row) =>
-        {
-            Entity e = it.Entity(row);
-            Assert.True(e == alice);
-
-            it.Targets(1, (Entity tgt) =>
-            {
-                if (tgtCount == 0)
-                    Assert.True(tgt == pizza);
-                if (tgtCount == 1)
-                    Assert.True(tgt == salad);
-                tgtCount++;
-            });
-
-            count++;
-        });
-
-        Assert.Equal(1, count);
-        Assert.Equal(2, tgtCount);
-    }
-
-    [Fact]
-    private void IterTargetsFieldOutOfRange()
-    {
-        using World world = World.Create();
-
-        Entity likes = world.Entity();
-        Entity pizza = world.Entity();
-        Entity salad = world.Entity();
-        Entity alice = world.Entity()
-            .Add(likes, pizza)
-            .Add(likes, salad);
-
-        using Query q = world.QueryBuilder()
-            .With(likes, Ecs.Any)
-            .Build();
-
-        q.Each((Iter it, int row) =>
-        {
-            Entity e = it.Entity(row);
-            Assert.True(e == alice);
-
-            Assert.Throws<Ecs.AssertionException>(() =>
-            {
-                it.Targets(1, (Entity _) => { });
-            });
-        });
-    }
-
-    [Fact]
-    private void IterTargetsFieldNotAPair()
-    {
-        using World world = World.Create();
-
-        Entity likes = world.Entity();
-        Entity pizza = world.Entity();
-        Entity salad = world.Entity();
-        Entity alice = world.Entity()
-            .Add<Position>()
-            .Add(likes, pizza)
-            .Add(likes, salad);
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .Build();
-
-        q.Each((Iter it, int row) =>
-        {
-            Entity e = it.Entity(row);
-            Assert.True(e == alice);
-
-            Assert.Throws<Ecs.AssertionException>(() =>
-            {
-                it.Targets(1, (Entity _) => { });
-            });
-        });
-    }
-
-    [Fact]
-    private void IterTargetsFieldNotSet()
-    {
-        using World world = World.Create();
-
-        Entity likes = world.Entity();
-        Entity alice = world.Entity()
-            .Add<Position>();
-
-        using Query q = world.QueryBuilder()
-            .With<Position>()
-            .With(likes, Ecs.Any).Optional()
-            .Build();
-
-        q.Each((Iter it, int row) =>
-        {
-            Entity e = it.Entity(row);
-            Assert.True(e == alice);
-            Assert.True(!it.IsSet(1));
-
-            Assert.Throws<Ecs.AssertionException>(() =>
-            {
-                it.Targets(1, (Entity _) => { });
-            });
-        });
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using Flecs.NET.Core;
+using Xunit;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Tests.Cpp;
+
+[SuppressMessage("ReSharper", "ParameterOnlyUsedForPreconditionCheck.Local")]
+[SuppressMessage("ReSharper", "CompareOfFloatsByEqualityOperator")]
+[SuppressMessage("ReSharper", "AccessToDisposedClosure")]
+[SuppressMessage("ReSharper", "AccessToModifiedClosure")]
+[SuppressMessage("ReSharper", "VariableHidesOuterVariable")]
+public unsafe class QueryTests
+{
+    public static int InvokedCount;
+
+    public QueryTests()
+    {
+        InvokedCount = default;
+    }
+
+    [Fact]
+    private void TermEachComponent()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Set(new Position(1, 2));
+        Entity e2 = world.Entity().Set(new Position(3, 4));
+        Entity e3 = world.Entity().Set(new Position(5, 6));
+
+        e3.Add<Tag>();
+
+        int count = 0;
+        world.Each((Entity e, ref Position p) =>
+        {
+            if (e == e1)
+            {
+                Assert.Equal(1, p.X);
+                Assert.Equal(2, p.Y);
+                count++;
+            }
+
+            if (e == e2)
+            {
+                Assert.Equal(3, p.X);
+                Assert.Equal(4, p.Y);
+                count++;
+            }
+
+            if (e == e3)
+            {
+                Assert.Equal(5, p.X);
+                Assert.Equal(6, p.Y);
+                count++;
+            }
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    // TODO: Remove this?
+    // [Fact]
+    // private void TermEachTag()
+    // {
+    //     using World world = World.Create();
+    //
+    //     Entity e1 = world.Entity().Add<Foo>();
+    //     Entity e2 = world.Entity().Add<Foo>();
+    //     Entity e3 = world.Entity().Add<Foo>();
+    //
+    //     e3.Add<Tag>();
+    //
+    //     int count = 0;
+    //     world.Each((Entity e, ref Foo _) =>
+    //     {
+    //         if (e == e1 || e == e2 || e == e3) count++;
+    //     });
+    //
+    //     Assert.Equal(3, count);
+    // }
+
+    [Fact]
+    private void TermEachId()
+    {
+        using World world = World.Create();
+
+        Entity foo = world.Entity();
+
+        Entity e1 = world.Entity().Add(foo);
+        Entity e2 = world.Entity().Add(foo);
+        Entity e3 = world.Entity().Add(foo);
+
+        e3.Add<Tag>();
+
+        int count = 0;
+        world.Each(foo, (Entity e) =>
+        {
+            if (e == e1 || e == e2 || e == e3) count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void TermEachPairId()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Entity obj = world.Entity();
+
+        Entity e1 = world.Entity().Add(rel, obj);
+        Entity e2 = world.Entity().Add(rel, obj);
+        Entity e3 = world.Entity().Add(rel, obj);
+
+        e3.Add<Tag>();
+
+        int count = 0;
+        world.Each(world.Pair(rel, obj), (Entity e) =>
+        {
+            if (e == e1 || e == e2 || e == e3) count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void TermEachPairRelationWildcard()
+    {
+        using World world = World.Create();
+
+        Entity rel1 = world.Entity();
+        Entity rel2 = world.Entity();
+        Entity obj = world.Entity();
+
+        Entity e1 = world.Entity().Add(rel1, obj);
+        Entity e2 = world.Entity().Add(rel1, obj);
+        Entity e3 = world.Entity().Add(rel2, obj);
+
+        e3.Add<Tag>();
+
+        int count = 0;
+        world.Each(world.Pair(Ecs.Wildcard, obj), (Entity e) =>
+        {
+            if (e == e1 || e == e2 || e == e3) count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void TermEachPairObjectWildcard()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Entity obj1 = world.Entity();
+        Entity obj2 = world.Entity();
+
+        Entity e1 = world.Entity().Add(rel, obj1);
+        Entity e2 = world.Entity().Add(rel, obj1);
+        Entity e3 = world.Entity().Add(rel, obj2);
+
+        e3.Add<Tag>();
+
+        int count = 0;
+        world.Each(world.Pair(rel, Ecs.Wildcard), (Entity e) =>
+        {
+            if (e == e1 || e == e2 || e == e3) count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void TermGetId()
+    {
+        using World world = World.Create();
+
+        Entity foo = world.Entity();
+        Entity bar = world.Entity();
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With<Velocity>()
+            .With(foo, bar)
+            .Build();
+
+        Assert.Equal(3, q.FieldCount());
+
+        Term
+            t = q.Term(0);
+        Assert.True(t.Id() == world.Id<Position>());
+        t = q.Term(1);
+        Assert.True(t.Id() == world.Id<Velocity>());
+        t = q.Term(2);
+        Assert.True(t.Id() == world.Pair(foo, bar));
+    }
+
+    [Fact]
+    private void TermGetSubj()
+    {
+        using World world = World.Create();
+
+        Entity foo = world.Entity();
+        Entity bar = world.Entity();
+        Entity src = world.Entity();
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With<Velocity>().Src(src)
+            .With(foo, bar)
+            .Build();
+
+        Assert.Equal(3, q.FieldCount());
+
+        Term
+            t = q.Term(0);
+        Assert.True(t.GetSrc() == Ecs.This);
+        t = q.Term(1);
+        Assert.True(t.GetSrc() == src);
+        t = q.Term(2);
+        Assert.True(t.GetSrc() == Ecs.This);
+    }
+
+    [Fact]
+    private void TermGetPred()
+    {
+        using World world = World.Create();
+
+        Entity foo = world.Entity();
+        Entity bar = world.Entity();
+        Entity src = world.Entity();
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With<Velocity>().Src(src)
+            .With(foo, bar)
+            .Build();
+
+        Assert.Equal(3, q.FieldCount());
+
+        Term
+            t = q.Term(0);
+        Assert.True(t.GetFirst() == world.Id<Position>());
+        t = q.Term(1);
+        Assert.True(t.GetFirst() == world.Id<Velocity>());
+        t = q.Term(2);
+        Assert.True(t.GetFirst() == foo);
+    }
+
+    [Fact]
+    private void TermGetObj()
+    {
+        using World world = World.Create();
+
+        Entity foo = world.Entity();
+        Entity bar = world.Entity();
+        Entity src = world.Entity();
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With<Velocity>().Src(src)
+            .With(foo, bar)
+            .Build();
+
+        Assert.Equal(3, q.FieldCount());
+
+        Term
+            t = q.Term(0);
+        Assert.True(t.GetSecond() == 0);
+        t = q.Term(1);
+        Assert.True(t.GetSecond() == 0);
+        t = q.Term(2);
+        Assert.True(t.GetSecond() == bar);
+    }
+
+    [Fact]
+    private void GetFirst()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Add<A>();
+        world.Entity().Add<A>();
+        world.Entity().Add<A>();
+
+        using Query q = world.QueryBuilder()
+            .With<A>()
+            .Build();
+
+        Entity first = q.Iter().First();
+        Assert.True(first != 0);
+        Assert.True(first == e1);
+    }
+
+    [Fact]
+    private void GetCountDirect()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<A>();
+        world.Entity().Add<A>();
+        world.Entity().Add<A>();
+
+        using Query q = world.QueryBuilder()
+            .With<A>()
+            .Build();
+
+        Assert.Equal(3, q.Count());
+    }
+
+    [Fact]
+    private void GetIsTrueDirect()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<A>();
+        world.Entity().Add<A>();
+        world.Entity().Add<A>();
+
+        using Query q1 = world.QueryBuilder()
+            .With<A>()
+            .Build();
+
+        using Query q2 = world.QueryBuilder()
+            .With<B>()
+            .Build();
+
+        Assert.True(q1.IsTrue());
+        Assert.False(q2.IsTrue());
+    }
+
+    [Fact]
+    private void GetFirstDirect()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Add<A>();
+        world.Entity().Add<A>();
+        world.Entity().Add<A>();
+
+        using Query q = world.QueryBuilder()
+            .With<A>()
+            .Build();
+
+        Entity first = q.First();
+        Assert.True(first != 0);
+        Assert.True(first == e1);
+    }
+
+    [Fact]
+    private void EachWithNoThis()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> f = world.QueryBuilder<Position, Velocity>()
+            .TermAt(0).Src(e)
+            .TermAt(1).Src(e)
+            .Build();
+
+        int count = 0;
+
+        f.Each((ref Position p, ref Velocity v) =>
+        {
+            count++;
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void EachWithIterNoThis()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> f = world.QueryBuilder<Position, Velocity>()
+            .TermAt(0).Src(e)
+            .TermAt(1).Src(e)
+            .Build();
+
+        int count = 0;
+
+        f.Each((Iter it, int index, ref Position p, ref Velocity v) =>
+        {
+            count++;
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+            Assert.Equal(1, v.X);
+            Assert.Equal(2, v.Y);
+            Assert.Equal(0, index);
+            Assert.Equal(0, it.Count());
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    // [Fact]
+    // private void InvalidEachWithNoThis()
+    // {
+    //     install_test_abort();
+    //
+    //     using World world = World.Create();
+    //
+    //     Entity e = world.Entity()
+    //         .Set(new Position(10, 20))
+    //         .Set(new Velocity(1, 2));
+    //
+    //     using var f = world.QueryBuilder<Position, Velocity>()
+    //         .TermAt(0).Src(e)
+    //         .TermAt(1).Src(e)
+    //         .Build();
+    //
+    //     test_expect_abort();
+    //
+    //     f.Each((Entity e, ref Position p, ref Velocity v) => { });
+    // }
+
+    [Fact]
+    private void NamedQuery()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Add<Position>();
+        Entity e2 = world.Entity().Add<Position>();
+
+        using Query<Position> q = world.Query<Position>("my_query");
+
+        int count = 0;
+        q.Each((Entity e, ref Position _) =>
+        {
+            Assert.True(e == e1 || e == e2);
+            count++;
+        });
+        Assert.Equal(2, count);
+
+        Entity qe = q.Entity();
+        Assert.True(qe != 0);
+        Assert.Equal("my_query", qe.Name());
+    }
+
+    [Fact]
+    private void NamedScopedQuery()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Add<Position>();
+        Entity e2 = world.Entity().Add<Position>();
+
+        using Query<Position> q = world.Query<Position>("my.query");
+
+        int count = 0;
+        q.Each((Entity e, ref Position _) =>
+        {
+            Assert.True(e == e1 || e == e2);
+            count++;
+        });
+        Assert.Equal(2, count);
+
+        Entity qe = q.Entity();
+        Assert.True(qe != 0);
+        Assert.Equal("query", qe.Name());
+        Assert.Equal(".my.query", qe.Path());
+    }
+
+    [Fact]
+    private void SetThisVar()
+    {
+        using World world = World.Create();
+
+        world.Entity().Set(new Position(1, 2));
+        Entity e2 = world.Entity().Set(new Position(3, 4));
+        world.Entity().Set(new Position(5, 6));
+
+        using Query<Position> q = world.Query<Position>("my.query");
+
+        int count = 0;
+        q.Iter().SetVar(0, e2).Each((Entity e, ref Position _) =>
+        {
+            Assert.True(e == e2);
+            count++;
+        });
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void InspectTermsWithExpr()
+    {
+        using World world = World.Create();
+
+        using Query f = world.QueryBuilder()
+            .Expr("(ChildOf,#0)")
+            .Build();
+
+        int count = 0;
+        f.EachTerm((ref Term term) =>
+        {
+            Assert.True(term.Id().IsPair());
+            count++;
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void Find()
+    {
+        using World world = World.Create();
+
+        world.Entity().Set(new Position(10, 20));
+        Entity e2 = world.Entity().Set(new Position(20, 30));
+
+        using Query<Position> q = world.Query<Position>();
+
+        Entity r = q.Find((ref Position p) => { return p.X == 20; });
+
+        Assert.True(r == e2);
+    }
+
+    [Fact]
+    private void FindNotFound()
+    {
+        using World world = World.Create();
+
+        world.Entity().Set(new Position(10, 20));
+        world.Entity().Set(new Position(20, 30));
+
+        using Query<Position> q = world.Query<Position>();
+
+        Entity r = q.Find((ref Position p) => { return p.X == 30; });
+
+        Assert.True(r == 0);
+    }
+
+    [Fact]
+    private void FindWithEntity()
+    {
+        using World world = World.Create();
+
+        world.Entity().Set(new Position(10, 20)).Set(new Velocity(20, 30));
+        Entity e2 = world.Entity().Set(new Position(20, 30)).Set(new Velocity(20, 30));
+
+        using Query<Position> q = world.Query<Position>();
+
+        Entity r = q.Find((Entity e, ref Position p) =>
+        {
+            return p.X == e.GetPtr<Velocity>()->X &&
+                   p.Y == e.GetPtr<Velocity>()->Y;
+        });
+
+        Assert.True(r == e2);
+    }
+
+    [Fact]
+    private void FindWithMatchEmptyTables()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Set(new Position(10, 20)).Add<Velocity>();
+        e1.Destruct();
+        Entity e2 = world.Entity().Set(new Position(20, 30));
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .QueryFlags(Ecs.QueryMatchEmptyTables)
+            .Build();
+
+        Entity r = q.Find((ref Position p) =>
+        {
+            return p.X == 20;
+        });
+
+        Assert.True(r == e2);
+    }
+
+    [Fact]
+    private void FindWithEntityWithMatchEmptyTables()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Set(new Position(10, 20)).Add<Velocity>();
+        e1.Destruct();
+        Entity e2 = world.Entity().Set(new Position(20, 30));
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .QueryFlags(EcsQueryMatchEmptyTables)
+            .Build();
+
+        Entity r = q.Find((Entity e, ref Position p) =>
+        {
+            return p.X == 20;
+        });
+
+        Assert.True(r == e2);
+    }
+
+    [Fact]
+    private void Run()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                foreach (int i in it)
+                {
+                    p[i].X += v[i].X;
+                    p[i].Y += v[i].Y;
+                }
+            }
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void RunConst()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                foreach (int i in it)
+                {
+                    p[i].X += v[i].X;
+                    p[i].Y += v[i].Y;
+                }
+            }
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void RunShared()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .Set(new Velocity(1, 2));
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Add(Ecs.IsA, @base);
+
+        Entity e2 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(3, 4));
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .Expr("Velocity(self|up IsA)")
+            .Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                if (!it.IsSelf(1))
+                    foreach (int i in it)
+                    {
+                        p[i].X += v[0].X;
+                        p[i].Y += v[0].Y;
+                    }
+                else
+                    foreach (int i in it)
+                    {
+                        p[i].X += v[i].X;
+                        p[i].Y += v[i].Y;
+                    }
+            }
+        });
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        p = e2.GetPtr<Position>();
+        Assert.Equal(13, p->X);
+        Assert.Equal(24, p->Y);
+    }
+
+    [Fact]
+    private void RunOptional()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+        world.Component<Mass>();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2))
+            .Set(new Mass(1));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(30, 40))
+            .Set(new Velocity(3, 4))
+            .Set(new Mass(1));
+
+        Entity e3 = world.Entity()
+            .Set(new Position(50, 60));
+
+        Entity e4 = world.Entity()
+            .Set(new Position(70, 80));
+
+        using Query<Position, Velocity, Mass> q = world.QueryBuilder<Position, Velocity, Mass>()
+            .TermAt(1).Optional()
+            .TermAt(2).Optional()
+            .Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+                Field<Mass> m = it.Field<Mass>(2);
+
+                if (it.IsSet(1) && it.IsSet(2))
+                    foreach (int i in it)
+                    {
+                        p[i].X += v[i].X * m[i].Value;
+                        p[i].Y += v[i].Y * m[i].Value;
+                    }
+                else
+                    foreach (int i in it)
+                    {
+                        p[i].X++;
+                        p[i].Y++;
+                    }
+            }
+        });
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        p = e2.GetPtr<Position>();
+        Assert.Equal(33, p->X);
+        Assert.Equal(44, p->Y);
+
+        p = e3.GetPtr<Position>();
+        Assert.Equal(51, p->X);
+        Assert.Equal(61, p->Y);
+
+        p = e4.GetPtr<Position>();
+        Assert.Equal(71, p->X);
+        Assert.Equal(81, p->Y);
+    }
+
+    [Fact]
+    private void RunSparse()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.Sparse);
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                foreach (int i in it)
+                {
+                    ref Position p = ref it.FieldAt<Position>(0, i);
+                    p.X += v[i].X;
+                    p.Y += v[i].Y;
+                }
+            }
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void RunSparseWithWith()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.Sparse);
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With<Velocity>()
+            .Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                foreach (int i in it)
+                {
+                    ref Position p = ref it.FieldAt<Position>(0, i);
+                    p.X += v[i].X;
+                    p.Y += v[i].Y;
+                }
+            }
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void Each()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Each((ref Position p, ref Velocity v) =>
+        {
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void EachConst()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Each((ref Position p, ref Velocity v) =>
+        {
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void EachShared()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity @base = world.Entity()
+            .Set(new Velocity(1, 2));
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Add(Ecs.IsA, @base);
+
+        Entity e2 = world.Entity()
+            .Set(new Position(20, 30))
+            .Add(Ecs.IsA, @base);
+
+        Entity e3 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(3, 4));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Each((ref Position p, ref Velocity v) =>
+        {
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        p = e2.GetPtr<Position>();
+        Assert.Equal(21, p->X);
+        Assert.Equal(32, p->Y);
+
+        p = e3.GetPtr<Position>();
+        Assert.Equal(13, p->X);
+        Assert.Equal(24, p->Y);
+    }
+
+    [Fact]
+    private void EachOptional()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+        world.Component<Mass>();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2))
+            .Set(new Mass(1));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(30, 40))
+            .Set(new Velocity(3, 4))
+            .Set(new Mass(1));
+
+        Entity e3 = world.Entity()
+            .Set(new Position(50, 60));
+
+        Entity e4 = world.Entity()
+            .Set(new Position(70, 80));
+
+        using Query<Position, Velocity, Mass> q = world.QueryBuilder<Position, Velocity, Mass>()
+            .TermAt(1).Optional()
+            .TermAt(2).Optional()
+            .Build();
+
+        q.Each((ref Position p, ref Velocity v, ref Mass m) =>
+        {
+            if (!Unsafe.IsNullRef(ref v) && !Unsafe.IsNullRef(ref m))
+            {
+                p.X += v.X * m.Value;
+                p.Y += v.Y * m.Value;
+            }
+            else
+            {
+                p.X++;
+                p.Y++;
+            }
+        });
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        p = e2.GetPtr<Position>();
+        Assert.Equal(33, p->X);
+        Assert.Equal(44, p->Y);
+
+        p = e3.GetPtr<Position>();
+        Assert.Equal(51, p->X);
+        Assert.Equal(61, p->Y);
+
+        p = e4.GetPtr<Position>();
+        Assert.Equal(71, p->X);
+        Assert.Equal(81, p->Y);
+    }
+
+    [Fact]
+    private void EachSparse()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.Sparse);
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Each((ref Position p, ref Velocity v) =>
+        {
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void EachSparseWithWith()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.Sparse);
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With<Velocity>()
+            .Build();
+
+        q.Each((Iter it, int row) =>
+        {
+            ref Position p = ref it.FieldAt<Position>(0, row);
+            ref Velocity v = ref it.FieldAt<Velocity>(1, row);
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void EachSparseMany()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.Sparse);
+        world.Component<Velocity>();
+
+        List<Entity> entities = new List<Entity>();
+
+        for (int i = 0; i < 2000; i++)
+        {
+            entities.Add(
+                world.Entity()
+                    .Set(new Position(10 + i, 20 + i))
+                    .Set(new Velocity(i, i))
+            );
+        }
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        q.Each(static (ref Position p, ref Velocity v) =>
+        {
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        for (int i = 0; i < 2000; i++)
+        {
+            Entity e = entities[i];
+
+            Position* p = e.GetPtr<Position>();
+            Assert.Equal(10 + i * 2, p->X);
+            Assert.Equal(20 + i * 2, p->Y);
+
+            Velocity* v = e.GetPtr<Velocity>();
+            Assert.Equal(i, v->X);
+            Assert.Equal(i, v->Y);
+        }
+    }
+
+    [Fact]
+    private void Signature()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query q = world.QueryBuilder().Expr("Position, Velocity").Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                foreach (int i in it)
+                {
+                    p[i].X += v[i].X;
+                    p[i].Y += v[i].Y;
+                }
+            }
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void SignatureConst()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity entity = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        using Query q = world.QueryBuilder().Expr("Position, [in] Velocity").Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                foreach (int i in it)
+                {
+                    p[i].X += v[i].X;
+                    p[i].Y += v[i].Y;
+                }
+            }
+        });
+
+        Position* p = entity.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+    }
+
+    [Fact]
+    private void SignatureShared()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+        world.Component<Velocity>().Add(Ecs.OnInstantiate, Ecs.Inherit);
+
+        Entity @base = world.Entity()
+            .Set(new Velocity(1, 2));
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Add(Ecs.IsA, @base);
+
+        Entity e2 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(3, 4));
+
+        using Query q = world.QueryBuilder()
+            .Expr("Position, [in] Velocity(self|up IsA)")
+            .Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+
+                if (!it.IsSelf(1))
+                    foreach (int i in it)
+                    {
+                        p[i].X += v[0].X;
+                        p[i].Y += v[0].Y;
+                    }
+                else
+                    foreach (int i in it)
+                    {
+                        p[i].X += v[i].X;
+                        p[i].Y += v[i].Y;
+                    }
+            }
+        });
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        p = e2.GetPtr<Position>();
+        Assert.Equal(13, p->X);
+        Assert.Equal(24, p->Y);
+    }
+
+    [Fact]
+    private void SignatureOptional()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+        world.Component<Mass>();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2))
+            .Set(new Mass(1));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(30, 40))
+            .Set(new Velocity(3, 4))
+            .Set(new Mass(1));
+
+        Entity e3 = world.Entity()
+            .Set(new Position(50, 60));
+
+        Entity e4 = world.Entity()
+            .Set(new Position(70, 80));
+
+        using Query q = world.QueryBuilder().Expr("Position, ?Velocity, ?Mass").Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Field<Velocity> v = it.Field<Velocity>(1);
+                Field<Mass> m = it.Field<Mass>(2);
+
+                if (it.IsSet(1) && it.IsSet(2))
+                    foreach (int i in it)
+                    {
+                        p[i].X += v[i].X * m[i].Value;
+                        p[i].Y += v[i].Y * m[i].Value;
+                    }
+                else
+                    foreach (int i in it)
+                    {
+                        p[i].X++;
+                        p[i].Y++;
+                    }
+            }
+        });
+
+        Position* p = e1.GetPtr<Position>();
+        Assert.Equal(11, p->X);
+        Assert.Equal(22, p->Y);
+
+        p = e2.GetPtr<Position>();
+        Assert.Equal(33, p->X);
+        Assert.Equal(44, p->Y);
+
+        p = e3.GetPtr<Position>();
+        Assert.Equal(51, p->X);
+        Assert.Equal(61, p->Y);
+
+        p = e4.GetPtr<Position>();
+        Assert.Equal(71, p->X);
+        Assert.Equal(81, p->Y);
+    }
+
+    [Fact]
+    private void QuerySinglePair()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<Pair, Position>();
+        Entity e2 = world.Entity().Add<Pair, Velocity>();
+
+        using Query q = world.QueryBuilder()
+            .Expr("(Pair, Velocity)")
+            .Build();
+
+        int tableCount = 0;
+        int entityCount = 0;
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                tableCount++;
+                foreach (int i in it)
+                {
+                    Assert.True(it.Entity(i) == e2);
+                    entityCount++;
+                }
+            }
+        });
+
+        Assert.Equal(1, tableCount);
+        Assert.Equal(1, entityCount);
+    }
+
+    [Fact]
+    private void TagWithEach()
+    {
+        using World world = World.Create();
+
+        using Query q = world.QueryBuilder()
+            .With<Tag>()
+            .Build();
+
+        Entity e = world.Entity()
+            .Add<Tag>();
+
+        q.Each((Entity qe) => { Assert.True(qe == e); });
+    }
+
+    [Fact]
+    private void SharedTagWithEach()
+    {
+        using World world = World.Create();
+
+        using Query q = world.QueryBuilder()
+            .With<Tag>()
+            .Build();
+
+        Entity @base = world.Prefab()
+            .Add<Tag>();
+
+        Entity e = world.Entity()
+            .Add(Ecs.IsA, @base);
+
+        q.Each((Entity qe) => { Assert.True(qe == e); });
+    }
+
+    private static int ComparePosition(ulong e1, void* p1, ulong e2, void* p2)
+    {
+        Position* pos1 = (Position*)p1;
+        Position* pos2 = (Position*)p2;
+        return pos1->X.CompareTo(pos2->X);
+    }
+
+    [Fact]
+    private void SortBy()
+    {
+        using World world = World.Create();
+
+        world.Entity().Set(new Position(1, 0));
+        world.Entity().Set(new Position(6, 0));
+        world.Entity().Set(new Position(2, 0));
+        world.Entity().Set(new Position(5, 0));
+        world.Entity().Set(new Position(4, 0));
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .OrderBy<Position>(ComparePosition)
+            .Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Position> p = it.Field<Position>(0);
+                Assert.Equal(5, it.Count());
+                Assert.Equal(1, p[0].X);
+                Assert.Equal(2, p[1].X);
+                Assert.Equal(4, p[2].X);
+                Assert.Equal(5, p[3].X);
+                Assert.Equal(6, p[4].X);
+            }
+        });
+    }
+
+    [Fact]
+    private void Changed()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Set(new Position(1, 0));
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .DetectChanges()
+            .Cached()
+            .Build();
+
+        using Query<Position> qW = world.Query<Position>();
+
+        Assert.True(q.Changed());
+
+        q.Each((ref Position _) => { });
+        Assert.False(q.Changed());
+
+        e.Set(new Position(2, 0));
+        Assert.True(q.Changed());
+
+        q.Each((ref Position _) => { });
+        Assert.False(q.Changed());
+
+        qW.Each((ref Position _) => { });
+        Assert.True(q.Changed());
+    }
+
+    [Fact]
+    private void DefaultCtor()
+    {
+        using World world = World.Create();
+
+        Query<Position> qVar;
+
+        int count = 0;
+        using Query<Position> q = world.Query<Position>();
+
+        world.Entity().Set(new Position(10, 20));
+
+        qVar = q;
+
+        qVar.Each((ref Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+            count++;
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void ExprWithTemplate()
+    {
+        using World world = World.Create();
+
+        Component<Template<int>> comp = world.Component<Template<int>>();
+        Assert.Equal("Template<System.Int32>", comp.Name());
+
+        int count = 0;
+        using Query<Position> q = world.QueryBuilder<Position>().Expr("Template<System.Int32>").Build();
+
+        world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Template<int>(30, 40));
+
+        q.Each((Entity e, ref Position p) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Template<int>* t = e.GetPtr<Template<int>>();
+            Assert.Equal(30, t->X);
+            Assert.Equal(40, t->Y);
+
+            count++;
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void QueryTypeWithTemplate()
+    {
+        using World world = World.Create();
+
+        Component<Template<int>> comp = world.Component<Template<int>>();
+        Assert.Equal("Template<System.Int32>", comp.Name());
+
+        int count = 0;
+        using Query<Position, Template<int>> q = world.Query<Position, Template<int>>();
+
+        world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Template<int>(30, 40));
+
+        q.Each((ref Position p, ref Template<int> t) =>
+        {
+            Assert.Equal(10, p.X);
+            Assert.Equal(20, p.Y);
+
+            Assert.Equal(30, t.X);
+            Assert.Equal(40, t.Y);
+
+            count++;
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void CompareTermId()
+    {
+        using World world = World.Create();
+
+        int count = 0;
+        Entity e = world.Entity().Add<Tag>();
+
+        using Query q = world.QueryBuilder()
+            .With<Tag>()
+            .Build();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Assert.True(it.Id(0) == it.World().Id<Tag>());
+                Assert.True(it.Entity(0) == e);
+            }
+
+            count++;
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    // [Fact]
+    // private void TestNoDeferEach()
+    // {
+    //     install_test_abort();
+    //
+    //     using World world = World.Create();
+    //
+    //     world.Entity().Add<Tag>().Set(new Value(10));
+    //
+    //     using var q = world.QueryBuilder<Value>()
+    //         .With<Tag>()
+    //         .Build();
+    //
+    //     q.Each((Entity e, ref Value v) =>
+    //     {
+    //         test_expect_abort();
+    //         e.Remove<Tag>();
+    //     });
+    //
+    //     Assert.True(false);
+    // }
+
+    // [Fact]
+    // private void TestNoDeferIter()
+    // {
+    //     install_test_abort();
+    //
+    //     using World world = World.Create();
+    //
+    //     world.Entity().Add<Tag>().Set(new Value(10));
+    //
+    //     using var q = world.QueryBuilder<Value>()
+    //         .With<Tag>()
+    //         .Build();
+    //
+    //     q.Run((Iter it, Field<Value> v) =>
+    //     {
+    //         foreach (int i in it)
+    //         {
+    //             test_expect_abort();
+    //             it.Entity(i).Remove<Tag>();
+    //         }
+    //     });
+    //
+    //     Assert.True(false);
+    // }
+
+    [Fact]
+    private void InspectTerms()
+    {
+        using World world = World.Create();
+
+        Entity p = world.Entity();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>()
+            .With(Ecs.ChildOf, p)
+            .Build();
+
+        Assert.Equal(3, q.FieldCount());
+
+        Term t = q.Term(0);
+        Assert.Equal(world.Id<Position>(), t.Id());
+        Assert.Equal(Ecs.And, t.Oper());
+        Assert.Equal(Ecs.InOutDefault, t.InOut());
+
+        t = q.Term(1);
+        Assert.Equal(world.Id<Velocity>(), t.Id());
+        Assert.Equal(Ecs.And, t.Oper());
+        Assert.Equal(Ecs.InOutDefault, t.InOut());
+
+        t = q.Term(2);
+        Assert.Equal(world.Pair(Ecs.ChildOf, p), t.Id());
+        Assert.Equal(Ecs.And, t.Oper());
+        Assert.Equal(Ecs.InOutDefault, t.InOut());
+        Assert.True(t.Id().Second() == p);
+    }
+
+    [Fact]
+    private void InspectTermsWithEach()
+    {
+        using World world = World.Create();
+
+        Entity p = world.Entity();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>()
+            .With(Ecs.ChildOf, p)
+            .Build();
+
+        int count = 0;
+        q.EachTerm((ref Term t) =>
+        {
+            if (count == 0)
+            {
+                Assert.Equal(world.Id<Position>(), t.Id());
+                Assert.Equal(Ecs.InOutDefault, t.InOut());
+            }
+            else if (count == 1)
+            {
+                Assert.Equal(world.Id<Velocity>(), t.Id());
+                Assert.Equal(Ecs.InOutDefault, t.InOut());
+            }
+            else if (count == 2)
+            {
+                Assert.Equal(world.Pair(Ecs.ChildOf, p), t.Id());
+                Assert.True(t.Id().Second() == p);
+                Assert.Equal(Ecs.InOutDefault, t.InOut());
+            }
+            else
+            {
+                Assert.True(false);
+            }
+
+            Assert.Equal(Ecs.And, t.Oper());
+
+            count++;
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void CompToStr()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>()
+            .Build();
+        Assert.Equal("Position($this), Velocity($this)", q.Str());
+    }
+
+    [Fact]
+    private void PairToStr()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>()
+            .With<Eats, Apples>()
+            .Build();
+        Assert.Equal("Position($this), Velocity($this), Eats($this,Apples)", q.Str());
+    }
+
+    [Fact]
+    private void OperNotToStr()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>().Oper(Ecs.Not)
+            .Build();
+        Assert.Equal("Position($this), !Velocity($this)", q.Str());
+    }
+
+    [Fact]
+    private void OperOptionalToStr()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>().Oper(Ecs.Optional)
+            .Build();
+        Assert.Equal("Position($this), ?Velocity($this)", q.Str());
+    }
+
+    [Fact]
+    private void OperOrToStr()
+    {
+        using World world = World.Create();
+
+        using Query q = world.QueryBuilder()
+            .With<Position>().Oper(Ecs.Or)
+            .With<Velocity>()
+            .Build();
+        Assert.Equal("Position($this) || Velocity($this)", q.Str());
+    }
+
+    [Fact]
+    private void EachNoEntity1Comp()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Position(1, 2));
+
+        using Query<Position> q = world.Query<Position>();
+
+        int count = 0;
+        q.Each((ref Position p) =>
+        {
+            Assert.Equal(1, p.X);
+            Assert.Equal(2, p.Y);
+            p.X += 1;
+            p.Y += 2;
+            count++;
+        });
+
+        Assert.Equal(1, count);
+
+        Position* pos = e.GetPtr<Position>();
+        Assert.Equal(2, pos->X);
+        Assert.Equal(4, pos->Y);
+    }
+
+    [Fact]
+    private void EachNoEntity2Comps()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity()
+            .Set(new Position(1, 2))
+            .Set(new Velocity(10, 20));
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        int count = 0;
+        q.Each((ref Position p, ref Velocity v) =>
+        {
+            Assert.Equal(1, p.X);
+            Assert.Equal(2, p.Y);
+            Assert.Equal(10, v.X);
+            Assert.Equal(20, v.Y);
+
+            p.X += 1;
+            p.Y += 2;
+            v.X += 1;
+            v.Y += 2;
+            count++;
+        });
+
+        Assert.Equal(1, count);
+
+        Assert.True(e.Read((ref readonly Position p, ref readonly Velocity v) =>
+        {
+            Assert.Equal(2, p.X);
+            Assert.Equal(4, p.Y);
+
+            Assert.Equal(11, v.X);
+            Assert.Equal(22, v.Y);
+        }));
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void IterNoComps1Comp()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>().Add<Velocity>();
+        world.Entity().Add<Velocity>();
+
+        using Query<Position> q = world.Query<Position>();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+                count += it.Count();
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void IterNoComps2Comps()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<Velocity>();
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>().Add<Velocity>();
+        world.Entity().Add<Position>().Add<Velocity>();
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+                count += it.Count();
+        });
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void IterNoCompsNoComps()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<Velocity>();
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>().Add<Velocity>();
+        world.Entity().Add<Position>().Add<Velocity>();
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .Build();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+                count += it.Count();
+        });
+
+        Assert.Equal(3, count);
+    }
+
+    [Fact]
+    private void IterQueryInSystem()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<Position>().Add<Velocity>();
+
+        using Query<Velocity> q = world.Query<Velocity>();
+
+        int count = 0;
+        world.System<Position>()
+            .Each((Entity _, ref Position _) => { q.Each((Entity _, ref Velocity _) => { count++; }); });
+
+        world.Progress();
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void IterType()
+    {
+        using World world = World.Create();
+
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>().Add<Velocity>();
+
+        using Query<Position> q = world.Query<Position>();
+
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Assert.True(it.Type().Count() >= 1);
+                Assert.True(it.Table().Has<Position>());
+            }
+        });
+    }
+
+    [Fact]
+    private void InstancedQueryWithSingletonEach()
+    {
+        using World world = World.Create();
+
+        world.Set(new Velocity(1, 2));
+
+        Entity e1 = world.Entity().Set(new Position(10, 20));
+        e1.Set(new Self(e1));
+        Entity e2 = world.Entity().Set(new Position(20, 30));
+        e2.Set(new Self(e2));
+        Entity e3 = world.Entity().Set(new Position(30, 40));
+        e3.Set(new Self(e3));
+        Entity e4 = world.Entity().Set(new Position(40, 50));
+        e4.Set(new Self(e4));
+        Entity e5 = world.Entity().Set(new Position(50, 60));
+        e5.Set(new Self(e5));
+
+        e4.Add<Tag>();
+        e5.Add<Tag>();
+
+        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
+            .TermAt(2).Singleton()
+            .Build();
+
+        int count = 0;
+        q.Each((Entity e, ref Self s, ref Position p, ref Velocity v) =>
+        {
+            Assert.True(e == s.Value);
+            p.X += v.X;
+            p.Y += v.Y;
+            count++;
+        });
+
+        Assert.Equal(5, count);
+
+        Assert.True(e1.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(11, p.X);
+            Assert.Equal(22, p.Y);
+        }));
+
+        Assert.True(e2.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(21, p.X);
+            Assert.Equal(32, p.Y);
+        }));
+
+        Assert.True(e3.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(31, p.X);
+            Assert.Equal(42, p.Y);
+        }));
+
+        Assert.True(e4.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(41, p.X);
+            Assert.Equal(52, p.Y);
+        }));
+
+        Assert.True(e5.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(51, p.X);
+            Assert.Equal(62, p.Y);
+        }));
+    }
+
+    [Fact]
+    private void InstancedQueryWithBaseEach()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity().Set(new Velocity(1, 2));
+
+        Entity e1 = world.Entity().IsA(@base).Set(new Position(10, 20));
+        e1.Set(new Self(e1));
+        Entity e2 = world.Entity().IsA(@base).Set(new Position(20, 30));
+        e2.Set(new Self(e2));
+        Entity e3 = world.Entity().IsA(@base).Set(new Position(30, 40));
+        e3.Set(new Self(e3));
+        Entity e4 = world.Entity().IsA(@base).Set(new Position(40, 50)).Add<Tag>();
+        e4.Set(new Self(e4));
+        Entity e5 = world.Entity().IsA(@base).Set(new Position(50, 60)).Add<Tag>();
+        e5.Set(new Self(e5));
+        Entity e6 = world.Entity().Set(new Position(60, 70)).Set(new Velocity(2, 3));
+        e6.Set(new Self(e6));
+        Entity e7 = world.Entity().Set(new Position(70, 80)).Set(new Velocity(4, 5));
+        e7.Set(new Self(e7));
+
+        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
+            .Build();
+
+        int count = 0;
+        q.Each((Entity e, ref Self s, ref Position p, ref Velocity v) =>
+        {
+            Assert.True(e == s.Value);
+            p.X += v.X;
+            p.Y += v.Y;
+            count++;
+        });
+
+        Assert.Equal(7, count);
+
+        Assert.True(e1.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(11, p.X);
+            Assert.Equal(22, p.Y);
+        }));
+
+        Assert.True(e2.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(21, p.X);
+            Assert.Equal(32, p.Y);
+        }));
+
+        Assert.True(e3.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(31, p.X);
+            Assert.Equal(42, p.Y);
+        }));
+
+        Assert.True(e4.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(41, p.X);
+            Assert.Equal(52, p.Y);
+        }));
+
+        Assert.True(e5.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(51, p.X);
+            Assert.Equal(62, p.Y);
+        }));
+
+        Assert.True(e6.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(62, p.X);
+            Assert.Equal(73, p.Y);
+        }));
+
+        Assert.True(e7.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(74, p.X);
+            Assert.Equal(85, p.Y);
+        }));
+    }
+
+    [Fact]
+    private void InstancedQueryWithSingletonIter()
+    {
+        using World world = World.Create();
+
+        world.Set(new Velocity(1, 2));
+
+        Entity e1 = world.Entity().Set(new Position(10, 20));
+        e1.Set(new Self(e1));
+        Entity e2 = world.Entity().Set(new Position(20, 30));
+        e2.Set(new Self(e2));
+        Entity e3 = world.Entity().Set(new Position(30, 40));
+        e3.Set(new Self(e3));
+        Entity e4 = world.Entity().Set(new Position(40, 50));
+        e4.Set(new Self(e4));
+        Entity e5 = world.Entity().Set(new Position(50, 60));
+        e5.Set(new Self(e5));
+
+        e4.Add<Tag>();
+        e5.Add<Tag>();
+
+        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
+            .TermAt(2).Singleton()
+            .Build();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Self> s = it.Field<Self>(0);
+                Field<Position> p = it.Field<Position>(1);
+                Field<Velocity> v = it.Field<Velocity>(2);
+
+                Assert.True(it.Count() > 1);
+
+                foreach (int i in it)
+                {
+                    p[i].X += v[0].X;
+                    p[i].Y += v[0].Y;
+                    Assert.True(it.Entity(i) == s[i].Value);
+                    count++;
+                }
+            }
+        });
+
+        Assert.Equal(5, count);
+
+        Assert.True(e1.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(11, p.X);
+            Assert.Equal(22, p.Y);
+        }));
+
+        Assert.True(e2.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(21, p.X);
+            Assert.Equal(32, p.Y);
+        }));
+
+        Assert.True(e3.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(31, p.X);
+            Assert.Equal(42, p.Y);
+        }));
+
+        Assert.True(e4.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(41, p.X);
+            Assert.Equal(52, p.Y);
+        }));
+
+        Assert.True(e5.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(51, p.X);
+            Assert.Equal(62, p.Y);
+        }));
+    }
+
+    [Fact]
+    private void InstancedQueryWithBaseIter()
+    {
+        using World world = World.Create();
+
+        Entity @base = world.Entity().Set(new Velocity(1, 2));
+
+        Entity e1 = world.Entity().IsA(@base).Set(new Position(10, 20));
+        e1.Set(new Self(e1));
+        Entity e2 = world.Entity().IsA(@base).Set(new Position(20, 30));
+        e2.Set(new Self(e2));
+        Entity e3 = world.Entity().IsA(@base).Set(new Position(30, 40));
+        e3.Set(new Self(e3));
+        Entity e4 = world.Entity().IsA(@base).Set(new Position(40, 50)).Add<Tag>();
+        e4.Set(new Self(e4));
+        Entity e5 = world.Entity().IsA(@base).Set(new Position(50, 60)).Add<Tag>();
+        e5.Set(new Self(e5));
+        Entity e6 = world.Entity().Set(new Position(60, 70)).Set(new Velocity(2, 3));
+        e6.Set(new Self(e6));
+        Entity e7 = world.Entity().Set(new Position(70, 80)).Set(new Velocity(4, 5));
+        e7.Set(new Self(e7));
+
+        using Query<Self, Position, Velocity> q = world.QueryBuilder<Self, Position, Velocity>()
+            .Build();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Field<Self> s = it.Field<Self>(0);
+                Field<Position> p = it.Field<Position>(1);
+                Field<Velocity> v = it.Field<Velocity>(2);
+
+                Assert.True(it.Count() > 1);
+
+                foreach (int i in it)
+                {
+                    if (it.IsSelf(2))
+                    {
+                        p[i].X += v[i].X;
+                        p[i].Y += v[i].Y;
+                    }
+                    else
+                    {
+                        p[i].X += v[0].X;
+                        p[i].Y += v[0].Y;
+                    }
+
+                    Assert.True(it.Entity(i) == s[i].Value);
+                    count++;
+                }
+            }
+        });
+
+        Assert.Equal(7, count);
+
+        Assert.True(e1.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(11, p.X);
+            Assert.Equal(22, p.Y);
+        }));
+
+        Assert.True(e2.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(21, p.X);
+            Assert.Equal(32, p.Y);
+        }));
+
+        Assert.True(e3.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(31, p.X);
+            Assert.Equal(42, p.Y);
+        }));
+
+        Assert.True(e4.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(41, p.X);
+            Assert.Equal(52, p.Y);
+        }));
+
+        Assert.True(e5.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(51, p.X);
+            Assert.Equal(62, p.Y);
+        }));
+
+        Assert.True(e6.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(62, p.X);
+            Assert.Equal(73, p.Y);
+        }));
+
+        Assert.True(e7.Read((ref readonly Position p) =>
+        {
+            Assert.Equal(74, p.X);
+            Assert.Equal(85, p.Y);
+        }));
+    }
+
+    [Fact]
+    private void QueryEachFromComponent()
+    {
+        using World world = World.Create();
+
+        world.Entity().Set(new Position()).Set(new Velocity());
+        world.Entity().Set(new Position()).Set(new Velocity());
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+        Entity e = world.Entity().Set(new QueryWrapper(q));
+
+        QueryWrapper* qc = e.GetPtr<QueryWrapper>();
+        Assert.True(qc != null);
+
+        int count = 0;
+        qc->Query.Each((Entity _, ref Position _, ref Velocity _) => { count++; });
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void QueryIterFromComponent()
+    {
+        using World world = World.Create();
+
+        world.Entity().Set(new Position()).Set(new Velocity());
+        world.Entity().Set(new Position()).Set(new Velocity());
+
+        using Query<Position, Velocity> q = world.Query<Position, Velocity>();
+        Entity e = world.Entity().Set(new QueryWrapper(q));
+
+        QueryWrapper* qc = e.GetPtr<QueryWrapper>();
+        Assert.True(qc != null);
+
+        int count = 0;
+        qc->Query.Run((Iter it) =>
+        {
+            while (it.Next())
+                count += it.Count();
+        });
+        Assert.Equal(2, count);
+    }
+
+    private static void EachFunc(Entity e, ref Position p)
+    {
+        InvokedCount++;
+        p.X++;
+        p.Y++;
+    }
+
+    private static void IterFunc(Iter it, Field<Position> p)
+    {
+        Assert.Equal(1, it.Count());
+        InvokedCount++;
+        p[0].X++;
+        p[0].Y++;
+    }
+
+    [Fact]
+    private void QueryEachWithFuncPtr()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Set(new Position(10, 20));
+
+        using Query<Position> q = world.Query<Position>();
+
+        q.Each(&EachFunc);
+
+        Assert.Equal(1, InvokedCount);
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(11, ptr->X);
+        Assert.Equal(21, ptr->Y);
+    }
+
+    [Fact]
+    private void QueryIterWithFuncPtr()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Set(new Position(10, 20));
+
+        using Query<Position> q = world.Query<Position>();
+
+        q.Iter(&IterFunc);
+
+        Assert.Equal(1, InvokedCount);
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(11, ptr->X);
+        Assert.Equal(21, ptr->Y);
+    }
+
+    [Fact]
+    private void QueryEachWithFuncNoPtr()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Set(new Position(10, 20));
+
+        using Query<Position> q = world.Query<Position>();
+
+        q.Each(EachFunc);
+
+        Assert.Equal(1, InvokedCount);
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(11, ptr->X);
+        Assert.Equal(21, ptr->Y);
+    }
+
+    [Fact]
+    private void QueryIterWithFuncNoPtr()
+    {
+        using World world = World.Create();
+
+        Entity e = world.Entity().Set(new Position(10, 20));
+
+        using Query<Position> q = world.Query<Position>();
+
+        q.Iter(IterFunc);
+
+        Assert.Equal(1, InvokedCount);
+
+        Position* ptr = e.GetPtr<Position>();
+        Assert.Equal(11, ptr->X);
+        Assert.Equal(21, ptr->Y);
+    }
+
+    [Fact]
+    private void QueryEachWithIter()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity();
+        e1.Set(new Self(e1));
+        e1.Set(new Position(10, 20));
+        Entity e2 = world.Entity();
+        e2.Set(new Self(e2));
+        e2.Set(new Position(20, 30));
+
+        using Query<Self, Position> q = world.Query<Self, Position>();
+
+        int invoked = 0;
+        q.Each((Iter it, int i, ref Self s, ref Position p) =>
+        {
+            Assert.Equal(2, it.Count());
+            Assert.Equal(s.Value, it.Entity(i));
+            p.X++;
+            p.Y++;
+            invoked++;
+        });
+
+        Assert.Equal(2, invoked);
+
+        Position* ptr = e1.GetPtr<Position>();
+        Assert.Equal(11, ptr->X);
+        Assert.Equal(21, ptr->Y);
+
+        ptr = e2.GetPtr<Position>();
+        Assert.Equal(21, ptr->X);
+        Assert.Equal(31, ptr->Y);
+    }
+
+    // [Fact]
+    // private void InvalidFieldFromEachWithIter()
+    // {
+    //     install_test_abort();
+    //
+    //     using World world = World.Create();
+    //
+    //     world.Entity()
+    //         .Set(new Position(10, 20))
+    //         .Set(new Velocity(1, 2));
+    //
+    //     using var q = world.QueryBuilder<Position>()
+    //         .With<Velocity>().InOut()
+    //         .Build();
+    //
+    //     test_expect_abort();
+    //
+    //     q.Each((Iter it, int index, ref Position p) => { it.Field(1); });
+    // }
+
+    // [Fact]
+    // private void InvalidFieldTFromEachWithIter()
+    // {
+    //     install_test_abort();
+    //
+    //     using World world = World.Create();
+    //
+    //     world.Entity()
+    //         .Set(new Position(10, 20))
+    //         .Set(new Velocity(1, 2));
+    //
+    //     using var q = world.QueryBuilder<Position>()
+    //         .With<Velocity>().InOut()
+    //         .Build();
+    //
+    //     test_expect_abort();
+    //
+    //     q.Each((Iter it, int index, ref Position p) => { it.Field<Velocity>(1); });
+    // }
+
+    // [Fact]
+    // private void InvalidFieldConstTFromEachWithIter()
+    // {
+    //     install_test_abort();
+    //
+    //     using World world = World.Create();
+    //
+    //     world.Entity()
+    //         .Set(new Position(10, 20))
+    //         .Set(new Velocity(1, 2));
+    //
+    //     using var q = world.QueryBuilder<Position>()
+    //         .With<Velocity>().InOut()
+    //         .Build();
+    //
+    //     test_expect_abort();
+    //
+    //     q.Each((Iter it, int index, ref Position p) => { it.Field<Velocity>(1); });
+    // }
+
+    // [Fact]
+    // private void FieldAtFromEachWithIter()
+    // {
+    //     using World world = World.Create();
+    //
+    //     Entity e1 = world.Entity()
+    //         .Set(new Position(10, 20))
+    //         .Set(new Velocity(1, 2));
+    //
+    //     Entity e2 = world.Entity()
+    //         .Set(new Position(20, 30))
+    //         .Set(new Velocity(3, 4));
+    //
+    //     using var q = world.QueryBuilder<Position>()
+    //         .With<Velocity>().InOut()
+    //         .Build();
+    //
+    //     int count = 0;
+    //
+    //     q.Each((Iter it, int row, ref Position p) =>
+    //     {
+    //         Velocity* v = (Velocity*)it.FieldAt(1, row);
+    //         if (it.Entity(row) == e1)
+    //         {
+    //             Assert.Equal(1, v->X);
+    //             Assert.Equal(2, v->Y);
+    //             count++;
+    //         }
+    //         else if (it.Entity(row) == e2)
+    //         {
+    //             Assert.Equal(3, v->X);
+    //             Assert.Equal(4, v->Y);
+    //             count++;
+    //         }
+    //     });
+    //
+    //     Assert.Equal(2, count);
+    // }
+
+    [Fact]
+    private void FieldAtTFromEachWithIter()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(20, 30))
+            .Set(new Velocity(3, 4));
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>().InOut()
+            .Build();
+
+        int count = 0;
+
+        q.Each((Iter it, int row, ref Position _) =>
+        {
+            ref Velocity v = ref it.FieldAt<Velocity>(1, row);
+            if (it.Entity(row) == e1)
+            {
+                Assert.Equal(1, v.X);
+                Assert.Equal(2, v.Y);
+                count++;
+            }
+            else if (it.Entity(row) == e2)
+            {
+                Assert.Equal(3, v.X);
+                Assert.Equal(4, v.Y);
+                count++;
+            }
+        });
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void FieldAtConstTFromEachWithIter()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(20, 30))
+            .Set(new Velocity(3, 4));
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With<Velocity>().InOut()
+            .Build();
+
+        int count = 0;
+
+        q.Each((Iter it, int row, ref Position _) =>
+        {
+            ref Velocity v = ref it.FieldAt<Velocity>(1, row);
+            if (it.Entity(row) == e1)
+            {
+                Assert.Equal(1, v.X);
+                Assert.Equal(2, v.Y);
+                count++;
+            }
+            else if (it.Entity(row) == e2)
+            {
+                Assert.Equal(3, v.X);
+                Assert.Equal(4, v.Y);
+                count++;
+            }
+        });
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void ChangeTracking()
+    {
+        using World world = World.Create();
+
+        using Query<Position> qw = world.Query<Position>();
+        using Query<Position> qr = world.QueryBuilder<Position>()
+            .DetectChanges()
+            .Cached()
+            .Build();
+
+        Entity e1 = world.Entity().Add<Tag>().Set(new Position(10, 20));
+        world.Entity().Set(new Position(20, 30));
+
+        Assert.True(qr.Changed());
+        qr.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+            }
+        });
+        Assert.False(qr.Changed());
+
+        int count = 0, changeCount = 0;
+
+        qw.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Assert.Equal(1, it.Count());
+
+                count++;
+
+                if (it.Entity(0) == e1)
+                {
+                    it.Skip();
+                    continue;
+                }
+
+                changeCount++;
+            }
+        });
+
+        Assert.Equal(2, count);
+        Assert.Equal(1, changeCount);
+
+        count = 0;
+        changeCount = 0;
+
+        Assert.True(qr.Changed());
+
+        qr.Run((Iter it) =>
+        {
+            while (it.Next())
+            {
+                Assert.Equal(1, it.Count());
+
+                count++;
+
+                if (it.Entity(0) == e1)
+                {
+                    Assert.False(it.Changed());
+                }
+                else
+                {
+                    Assert.True(it.Changed());
+                    changeCount++;
+                }
+            }
+        });
+
+        Assert.Equal(2, count);
+        Assert.Equal(1, changeCount);
+    }
+
+    [Fact]
+    private void NotWithWrite()
+    {
+        using World world = World.Create();
+
+        using Query q = world.QueryBuilder()
+            .With<A>()
+            .With<B>().Oper(Ecs.Not).Write()
+            .Build();
+
+        Entity e = world.Entity().Add<A>();
+
+        int count = 0;
+        world.Defer(() =>
+        {
+            q.Each((Entity ent) =>
+            {
+                ent.Add<B>();
+                count++;
+            });
+        });
+
+        Assert.Equal(1, count);
+        Assert.True(e.Has<B>());
+
+        q.Each((Entity _) => { count++; });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void InstancedNestedQueryWithIter()
+    {
+        using World world = World.Create();
+
+        using Query q1 = world.QueryBuilder()
+            .With<Position>()
+            .With<Mass>().Singleton().InOut()
+            .Build();
+
+        using Query q2 = world.QueryBuilder()
+            .With<Velocity>()
+            .Build();
+
+        world.Add<Mass>();
+        world.Entity().Add<Velocity>();
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>();
+
+        int count = 0;
+
+        q2.Run((Iter it2) =>
+        {
+            while (it2.Next())
+            {
+                q1.Iter(it2).Run((Iter it1) =>
+                {
+                    while (it1.Next())
+                    {
+                        Assert.Equal(2, it1.Count());
+                        count += it1.Count();
+                    }
+                });
+            }
+        });
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void InstancedNestedQueryWithEntity()
+    {
+        using World world = World.Create();
+
+        using Query q1 = world.QueryBuilder()
+            .With<Position>()
+            .With<Mass>().Singleton().InOut()
+            .Build();
+
+        using Query q2 = world.QueryBuilder()
+            .With<Velocity>()
+            .Build();
+
+        world.Add<Mass>();
+        world.Entity().Add<Velocity>();
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>();
+
+        int count = 0;
+
+        q2.Each((Entity e2) =>
+        {
+            q1.Iter(e2).Run((Iter it1) =>
+            {
+                while (it1.Next())
+                {
+                    Assert.Equal(2, it1.Count());
+                    count += it1.Count();
+                }
+            });
+        });
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void InstancedNestedQueryWithWorld()
+    {
+        using World world = World.Create();
+
+        using Query q1 = world.QueryBuilder()
+            .With<Position>()
+            .With<Mass>().Singleton().InOut()
+            .Build();
+
+        using Query q2 = world.QueryBuilder()
+            .With<Velocity>()
+            .Build();
+
+        world.Add<Mass>();
+        world.Entity().Add<Velocity>();
+        world.Entity().Add<Position>();
+        world.Entity().Add<Position>();
+
+        int count = 0;
+
+        q2.Run((Iter it2) =>
+        {
+            while (it2.Next())
+            {
+                q1.Iter(it2.World()).Run((Iter it1) =>
+                {
+                    while (it1.Next())
+                    {
+                        Assert.Equal(2, it1.Count());
+                        count += it1.Count();
+                    }
+                });
+            }
+        });
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void CapturedQuery()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.Query<Position>();
+        Entity e1 = world.Entity().Set(new Position(10, 20));
+
+        Action action = () =>
+        {
+            int count = 0;
+            q.Each((Entity e, ref Position p) =>
+            {
+                Assert.True(e == e1);
+                Assert.Equal(10, p.X);
+                Assert.Equal(20, p.Y);
+                count++;
+            });
+            Assert.Equal(1, count);
+        };
+
+        action();
+    }
+
+    [Fact]
+    private void PageIterCapturedQuery()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.Query<Position>();
+        world.Entity().Set(new Position(10, 20));
+        Entity e2 = world.Entity().Set(new Position(20, 30));
+        world.Entity().Set(new Position(10, 20));
+
+        Action action = () =>
+        {
+            int count = 0;
+            q.Iter().Page(1, 1).Each((Entity e, ref Position p) =>
+            {
+                Assert.True(e == e2);
+                Assert.Equal(20, p.X);
+                Assert.Equal(30, p.Y);
+                count++;
+            });
+            Assert.Equal(1, count);
+        };
+
+        action();
+    }
+
+    [Fact]
+    private void WorkerIterCapturedQuery()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.Query<Position>();
+        world.Entity().Set(new Position(10, 20));
+        Entity e2 = world.Entity().Set(new Position(20, 30));
+        world.Entity().Set(new Position(10, 20));
+
+        Action action = () =>
+        {
+            int count = 0;
+            q.Iter().Worker(1, 3).Each((Entity e, ref Position p) =>
+            {
+                Assert.True(e == e2);
+                Assert.Equal(20, p.X);
+                Assert.Equal(30, p.Y);
+                count++;
+            });
+            Assert.Equal(1, count);
+        };
+
+        action();
+    }
+
+    [Fact]
+    private void SetGroupCapturedQuery()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Entity tgtA = world.Entity();
+        Entity tgtB = world.Entity();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .GroupBy(rel)
+            .Build();
+
+        world.Entity().Set(new Position(10, 20)).Add(rel, tgtA);
+        Entity e2 = world.Entity().Set(new Position(20, 30)).Add(rel, tgtB);
+
+        new Action(() =>
+        {
+            int count = 0;
+            q.SetGroup(tgtB).Each((Entity e, ref Position p) =>
+            {
+                Assert.True(e == e2);
+                Assert.Equal(20, p.X);
+                Assert.Equal(30, p.Y);
+                count++;
+            });
+            Assert.Equal(1, count);
+        })();
+    }
+
+    [Fact]
+    private void SetVarCapturedQuery()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Entity tgtA = world.Entity();
+        Entity tgtB = world.Entity();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With(rel, "$var")
+            .Build();
+
+        world.Entity().Set(new Position(10, 20)).Add(rel, tgtA);
+        Entity e2 = world.Entity().Set(new Position(20, 30)).Add(rel, tgtB);
+
+        new Action(() =>
+        {
+            int count = 0;
+            q.SetVar("var", tgtB).Each((Entity e, ref Position p) =>
+            {
+                Assert.True(e == e2);
+                Assert.Equal(20, p.X);
+                Assert.Equal(30, p.Y);
+                count++;
+            });
+            Assert.Equal(1, count);
+        })();
+    }
+
+    [Fact]
+    private void SetVarIdCapturedQuery()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Entity tgtA = world.Entity();
+        Entity tgtB = world.Entity();
+
+        using Query<Position> q = world.QueryBuilder<Position>()
+            .With(rel, "$var")
+            .Build();
+
+        int var = q.FindVar("var");
+        Assert.True(var != -1);
+
+        world.Entity().Set(new Position(10, 20)).Add(rel, tgtA);
+        Entity e2 = world.Entity().Set(new Position(20, 30)).Add(rel, tgtB);
+
+        new Action(() =>
+        {
+            int count = 0;
+            q.SetVar(var, tgtB).Each((Entity e, ref Position p) =>
+            {
+                Assert.True(e == e2);
+                Assert.Equal(20, p.X);
+                Assert.Equal(30, p.Y);
+                count++;
+            });
+            Assert.Equal(1, count);
+        })();
+    }
+
+    [Fact]
+    private void IterEntities()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity().Set(new Position(10, 20));
+        Entity e2 = world.Entity().Set(new Position(10, 20));
+        Entity e3 = world.Entity().Set(new Position(10, 20));
+
+        world.Query<Position>()
+            .Run((Iter it) =>
+            {
+                while (it.Next())
+                {
+                    Assert.Equal(3, it.Count());
+
+                    Field<ulong> entities = it.Entities();
+                    Assert.True(entities[0] == e1);
+                    Assert.True(entities[1] == e2);
+                    Assert.True(entities[2] == e3);
+                }
+            });
+    }
+
+    [Fact]
+    private void IterGetPairWithId()
+    {
+        using World world = World.Create();
+
+        Entity rel = world.Entity();
+        Entity tgt = world.Entity();
+        Entity e = world.Entity().Add(rel, tgt);
+
+        using Query q = world.QueryBuilder()
+            .With(rel, Ecs.Wildcard)
+            .Build();
+
+        int count = 0;
+
+        q.Each((Iter it, int i) =>
+        {
+            Assert.True(it.Id(0).IsPair());
+            Assert.True(it.Id(0).First() == rel);
+            Assert.True(it.Id(0).Second() == tgt);
+            Assert.True(e == it.Entity(i));
+            count++;
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void QueryFromEntity()
+    {
+        using World world = World.Create();
+
+        Entity qe = world.Entity();
+        using Query<Position, Velocity> q1 = world.QueryBuilder<Position, Velocity>(qe)
+            .Build();
+
+        world.Entity().Add<Position>();
+        Entity e2 = world.Entity().Add<Position>().Add<Velocity>();
+
+        int count = 0;
+        q1.Each((Entity e, ref Position _, ref Velocity _) =>
+        {
+            count++;
+            Assert.True(e == e2);
+        });
+        Assert.Equal(1, count);
+
+        Query q2 = world.Query(qe);
+        q2.Each((Entity e) =>
+        {
+            count++;
+            Assert.True(e == e2);
+        });
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void QueryFromEntityName()
+    {
+        using World world = World.Create();
+
+        using Query<Position, Velocity> q1 = world.QueryBuilder<Position, Velocity>("qe")
+            .Build();
+
+        world.Entity().Add<Position>();
+        Entity e2 = world.Entity().Add<Position>().Add<Velocity>();
+
+        int count = 0;
+        q1.Each((Entity e, ref Position _, ref Velocity _) =>
+        {
+            count++;
+            Assert.True(e == e2);
+        });
+        Assert.Equal(1, count);
+
+        Query q2 = world.Query("qe");
+        q2.Each((Entity e) =>
+        {
+            count++;
+            Assert.True(e == e2);
+        });
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    private void RunWithIterFini()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q1 = world.Query<Position>();
+
+        int count = 0;
+        q1.Run((Iter it) =>
+        {
+            it.Fini();
+            count++;
+        });
+
+        Assert.Equal(1, count);
+    }
+
+
+    [Fact]
+    private void RunWithIterFiniInterrupt()
+    {
+        using World world = World.Create();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Add<Foo>();
+        world.Entity()
+            .Set(new Position(10, 20))
+            .Add<Bar>();
+        world.Entity()
+            .Set(new Position(10, 20))
+            .Add<Hello>();
+
+        using Query<Position> q = world.Query<Position>();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            Assert.True(it.Next());
+            Assert.Equal(1, it.Count());
+            Assert.Equal(e1, it.Entity(0));
+
+            Assert.True(it.Next());
+            count++;
+            it.Fini();
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void RunWithIterFiniEmpty()
+    {
+        using World world = World.Create();
+
+        using Query<Position> q = world.Query<Position>();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            count++;
+            it.Fini();
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void RunWithIterFiniNoQuery()
+    {
+        using World world = World.Create();
+
+        using Query q = world.Query();
+
+        int count = 0;
+        q.Run((Iter it) =>
+        {
+            count++;
+            it.Fini();
+        });
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    private void AddToMatchFromStagedQuery()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity e = world.Entity().Add<Position>();
+
+        World stage = world.GetStage(0);
+
+        world.ReadonlyBegin(false);
+
+        stage.Query<Position>()
+            .Each((Entity e, ref Position _) =>
+            {
+                e.Add<Velocity>();
+                Assert.True(!e.Has<Velocity>());
+            });
+
+        world.ReadonlyEnd();
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+    }
+
+    [Fact]
+    private void AddToMatchFromStagedQueryReadonlyThreaded()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+
+        Entity e = world.Entity().Add<Position>();
+
+        World stage = world.GetStage(0);
+
+        world.ReadonlyBegin(true);
+
+        stage.Query<Position>()
+            .Each((Entity e, ref Position _) =>
+            {
+                e.Add<Velocity>();
+                Assert.True(!e.Has<Velocity>());
+            });
+
+        world.ReadonlyEnd();
+
+        Assert.True(e.Has<Position>());
+        Assert.True(e.Has<Velocity>());
+    }
+
+    [Fact]
+    private void EmptyTablesEach()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+        world.Component<Tag>();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(20, 30))
+            .Set(new Velocity(2, 3));
+
+        e2.Add<Tag>();
+        e2.Remove<Tag>();
+
+        using Query<Position, Velocity> q = world.QueryBuilder<Position, Velocity>()
+            .QueryFlags(EcsQueryMatchEmptyTables)
+            .Build();
+
+        q.Each((ref Position p, ref Velocity v) =>
+        {
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        {
+            Position* p = e1.GetPtr<Position>();
+            Assert.Equal(11, p->X);
+            Assert.Equal(22, p->Y);
+        }
+        {
+            Position* p = e2.GetPtr<Position>();
+            Assert.Equal(22, p->X);
+            Assert.Equal(33, p->Y);
+        }
+    }
+
+    // TODO: Fix later
+    // [Fact]
+    // private void EmptyTablesEachWithEntity()
+    // {
+    //     using World world = World.Create();
+    //
+    //     world.Component<Position>();
+    //     world.Component<Velocity>();
+    //     world.Component<Tag>();
+    //
+    //     Entity e1 = world.Entity()
+    //         .Set(new Position(10, 20))
+    //         .Set(new Velocity(1, 2));
+    //
+    //     Entity e2 = world.Entity()
+    //         .Set(new Position(20, 30))
+    //         .Set(new Velocity(2, 3));
+    //
+    //     e2.Add<Tag>();
+    //     e2.Remove<Tag>();
+    //
+    //     using var q = world.QueryBuilder<Position, Velocity>()
+    //         .QueryFlags(EcsQueryMatchEmptyTables)
+    //         .Build();
+    //
+    //     q.Each((Entity e, ref Position p, ref Velocity v) =>
+    //     {
+    //         p.X += v.X;
+    //         p.Y += v.Y;
+    //     });
+    //
+    //     {
+    //         Position* p = e1.GetPtr<Position>();
+    //         Assert.Equal(11, p->X);
+    //         Assert.Equal(22, p->Y);
+    //     }
+    //     {
+    //         Position* p = e2.GetPtr<Position>();
+    //         Assert.Equal(22, p->X);
+    //         Assert.Equal(33, p->Y);
+    //     }
+    // }
+
+    [Fact]
+    private void EmptyTablesEachWithIter()
+    {
+        using World world = World.Create();
+
+        world.Component<Position>();
+        world.Component<Velocity>();
+        world.Component<Tag>();
+
+        Entity e1 = world.Entity()
+            .Set(new Position(10, 20))
+            .Set(new Velocity(1, 2));
+
+        Entity e2 = world.Entity()
+            .Set(new Position(20, 30))
+            .Set(new Velocity(2, 3));
+
+        e2.Add<Tag>();
+        e2.Remove<Tag>();
+
+        using Query<Position, Velocity> q = world.QueryBuilder<Position, Velocity>()
+            .QueryFlags(EcsQueryMatchEmptyTables)
+            .Build();
+
+        q.Each((Iter _, int _, ref Position p, ref Velocity v) =>
+        {
+            p.X += v.X;
+            p.Y += v.Y;
+        });
+
+        {
+            Position* p = e1.GetPtr<Position>();
+            Assert.Equal(11, p->X);
+            Assert.Equal(22, p->Y);
+        }
+        {
+            Position* p = e2.GetPtr<Position>();
+            Assert.Equal(22, p->X);
+            Assert.Equal(33, p->Y);
+        }
+    }
+
+    [Fact]
+    private void PairWithVariableSrc()
+    {
+        using World world = World.Create();
+
+        world.Component<RelData>();
+        world.Component<ThisComp>();
+        world.Component<OtherComp>();
+
+        Entity other = world.Entity()
+            .Set(new OtherComp(10));
+
+        for (int i = 0; i < 3; i++)
+            world.Entity()
+                .Set(new ThisComp(i))
+                .Add<RelData>(other);
+
+        using Query<RelData, ThisComp, OtherComp> q = world.QueryBuilder<RelData, ThisComp, OtherComp>()
+            .TermAt(0).Second("$other")
+            .TermAt(2).Src("$other")
+            .Build();
+
+        int isPresent = 0;
+        q.Each((ref RelData _, ref ThisComp thisComp, ref OtherComp otherComp) =>
+        {
+            isPresent |= 1 << thisComp.X;
+            Assert.Equal(10, otherComp.X);
+        });
+
+        Assert.Equal(7, isPresent);
+    }
+
+    [Fact]
+    private void PairWithVariableSrcNoRowFields()
+    {
+        using World world = World.Create();
+
+        world.Component<RelData>();
+        world.Component<ThisComp>();
+        world.Component<OtherComp>();
+
+        Entity other = world.Entity()
+            .Set(new OtherComp(0));
+
+        world.Entity()
+            .Set(new OtherComp(1));
+
+        for (int i = 0; i < 3; i++)
+            world.Entity()
+                .Set(new ThisComp(i))
+                .Add<RelData>(other);
+
+        using Query<RelData, ThisComp, OtherComp> q = world.QueryBuilder<RelData, ThisComp, OtherComp>()
+            .TermAt(0).Second("$other")
+            .TermAt(2).Src("$other")
+            .Build();
+
+        int isPresent = 0;
+        q.Each((ref RelData _, ref ThisComp thisComp, ref OtherComp otherComp) =>
+        {
+            isPresent |= 1 << thisComp.X;
+            Assert.Equal(0, otherComp.X);
+        });
+
+        Assert.Equal(7, isPresent);
+    }
+
+    [Fact]
+    private void IterTargets()
+    {
+        using World world = World.Create();
+
+        Entity likes = world.Entity();
+        Entity pizza = world.Entity();
+        Entity salad = world.Entity();
+        Entity alice = world.Entity()
+            .Add(likes, pizza)
+            .Add(likes, salad);
+
+        using Query q = world.QueryBuilder()
+            .With(likes, Ecs.Any)
+            .Build();
+
+        int count = 0;
+        int tgtCount = 0;
+
+        q.Each((Iter it, int row) =>
+        {
+            Entity e = it.Entity(row);
+            Assert.True(e == alice);
+
+            it.Targets(0, (Entity tgt) =>
+            {
+                if (tgtCount == 0)
+                    Assert.True(tgt == pizza);
+                if (tgtCount == 1)
+                    Assert.True(tgt == salad);
+                tgtCount++;
+            });
+
+            count++;
+        });
+
+        Assert.Equal(1, count);
+        Assert.Equal(2, tgtCount);
+    }
+
+    [Fact]
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    private void IterTargets2ndField()
+    {
+        using World world = World.Create();
+
+        Entity likes = world.Entity();
+        Entity pizza = world.Entity();
+        Entity salad = world.Entity();
+        Entity alice = world.Entity()
+            .Add<Position>()
+            .Add(likes, pizza)
+            .Add(likes, salad);
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With(likes, Ecs.Any)
+            .Build();
+
+        int count = 0;
+        int tgtCount = 0;
+
+        q.Each((Iter it, int row) =>
+        {
+            Entity e = it.Entity(row);
+            Assert.True(e == alice);
+
+            it.Targets(1, (Entity tgt) =>
+            {
+                if (tgtCount == 0)
+                    Assert.True(tgt == pizza);
+                if (tgtCount == 1)
+                    Assert.True(tgt == salad);
+                tgtCount++;
+            });
+
+            count++;
+        });
+
+        Assert.Equal(1, count);
+        Assert.Equal(2, tgtCount);
+    }
+
+    [Fact]
+    private void IterTargetsFieldOutOfRange()
+    {
+        using World world = World.Create();
+
+        Entity likes = world.Entity();
+        Entity pizza = world.Entity();
+        Entity salad = world.Entity();
+        Entity alice = world.Entity()
+            .Add(likes, pizza)
+            .Add(likes, salad);
+
+        using Query q = world.QueryBuilder()
+            .With(likes, Ecs.Any)
+            .Build();
+
+        q.Each((Iter it, int row) =>
+        {
+            Entity e = it.Entity(row);
+            Assert.True(e == alice);
+
+            Assert.Throws<Ecs.AssertionException>(() =>
+            {
+                it.Targets(1, (Entity _) => { });
+            });
+        });
+    }
+
+    [Fact]
+    private void IterTargetsFieldNotAPair()
+    {
+        using World world = World.Create();
+
+        Entity likes = world.Entity();
+        Entity pizza = world.Entity();
+        Entity salad = world.Entity();
+        Entity alice = world.Entity()
+            .Add<Position>()
+            .Add(likes, pizza)
+            .Add(likes, salad);
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .Build();
+
+        q.Each((Iter it, int row) =>
+        {
+            Entity e = it.Entity(row);
+            Assert.True(e == alice);
+
+            Assert.Throws<Ecs.AssertionException>(() =>
+            {
+                it.Targets(1, (Entity _) => { });
+            });
+        });
+    }
+
+    [Fact]
+    private void IterTargetsFieldNotSet()
+    {
+        using World world = World.Create();
+
+        Entity likes = world.Entity();
+        Entity alice = world.Entity()
+            .Add<Position>();
+
+        using Query q = world.QueryBuilder()
+            .With<Position>()
+            .With(likes, Ecs.Any).Optional()
+            .Build();
+
+        q.Each((Iter it, int row) =>
+        {
+            Entity e = it.Entity(row);
+            Assert.True(e == alice);
+            Assert.True(!it.IsSet(1));
+
+            Assert.Throws<Ecs.AssertionException>(() =>
+            {
+                it.Targets(1, (Entity _) => { });
+            });
+        });
+    }
+}
diff --git a/src/Flecs.NET.Tests/Cpp/UnionTests.cs b/src/Flecs.NET.Tests/Cpp/UnionTests.cs
deleted file mode 100644
index c2681768..00000000
--- a/src/Flecs.NET.Tests/Cpp/UnionTests.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Flecs.NET.Core;
-using Xunit;
-
-namespace Flecs.NET.Tests.Cpp;
-
-public class UnionTests
-{
-    [Fact]
-    private void AddCase()
-    {
-        using World world = World.Create();
-
-        Entity standing = world.Entity("Standing");
-        Entity walking = world.Entity("Walking");
-        Entity movement = world.Entity().Add(Ecs.Union);
-
-        Entity e = world.Entity()
-            .Add(movement, standing);
-        Assert.True(e.Has(movement, standing));
-
-        Table table = e.Table();
-
-        e.Add(movement, walking);
-        Assert.True(e.Table() == table);
-
-        Assert.True(e.Has(movement, walking));
-        Assert.True(!e.Has(movement, standing));
-    }
-
-    [Fact]
-    private void GetCase()
-    {
-        using World world = World.Create();
-
-        Entity standing = world.Entity("Standing");
-        world.Entity("Walking");
-        Entity movement = world.Entity().Add(Ecs.Union);
-
-        Entity e = world.Entity()
-            .Add(movement, standing);
-        Assert.True(e.Has(movement, standing));
-
-        Assert.True(e.Target(movement) == standing);
-    }
-
-    [Fact]
-    private void AddCaseWithType()
-    {
-        using World world = World.Create();
-
-        world.Component<Movement>().Add(Ecs.Union);
-
-        Entity e = world.Entity().Add<Movement, Standing>();
-        Assert.True((e.Has<Movement, Standing>()));
-
-        e.Add<Movement, Walking>();
-
-        Assert.True((e.Has<Movement, Walking>()));
-        Assert.True((!e.Has<Movement, Standing>()));
-    }
-
-    [Fact]
-    private void AddSwitchWithType()
-    {
-        using World world = World.Create();
-
-        world.Component<Movement>().Add(Ecs.Union);
-
-        Entity e = world.Entity().Add<Movement, Standing>();
-        Assert.True((e.Has<Movement, Standing>()));
-
-        e.Add<Movement, Walking>();
-
-        Assert.True((e.Has<Movement, Walking>()));
-        Assert.True((!e.Has<Movement, Standing>()));
-    }
-
-    [Fact]
-    private void AddRemoveSwitchWithType()
-    {
-        using World world = World.Create();
-
-        world.Component<Movement>().Add(Ecs.Union);
-
-        Entity e = world.Entity().Add<Movement, Standing>();
-        Assert.True(e.Has<Movement>(Ecs.Wildcard));
-        Assert.True((e.Has<Movement, Standing>()));
-
-        Table table = e.Table();
-
-        e.Add<Movement, Walking>();
-
-        Assert.True((e.Has<Movement, Walking>()));
-        Assert.True((!e.Has<Movement, Standing>()));
-        Assert.True(e.Table() == table);
-
-        Entity c = e.Target<Movement>();
-        Assert.True(c != 0);
-        Assert.True(c == world.Id<Walking>());
-
-        e.Remove<Movement>(Ecs.Wildcard);
-        Assert.True(!e.Has<Movement>(Ecs.Wildcard));
-        Assert.True((!e.Has<Movement, Walking>()));
-        Assert.True(e.Table() != table);
-    }
-
-    [Fact]
-    private void SwitchEnumType()
-    {
-        using World world = World.Create();
-
-        world.Component<Color>().Add(Ecs.Union);
-
-        Entity e = world.Entity().Add(Color.Red);
-        Assert.True(e.Has(Color.Red));
-        Assert.True(!e.Has(Color.Green));
-        Assert.True(!e.Has(Color.Blue));
-        Assert.True(e.Has<Color>(Ecs.Wildcard));
-
-        Table table = e.Table();
-
-        e.Add(Color.Green);
-        Assert.True(!e.Has(Color.Red));
-        Assert.True(e.Has(Color.Green));
-        Assert.True(!e.Has(Color.Blue));
-        Assert.True(e.Has<Color>(Ecs.Wildcard));
-        Assert.True(e.Table() == table);
-
-        e.Add(Color.Blue);
-        Assert.True(!e.Has(Color.Red));
-        Assert.True(!e.Has(Color.Green));
-        Assert.True(e.Has(Color.Blue));
-        Assert.True(e.Has<Color>(Ecs.Wildcard));
-        Assert.True(e.Table() == table);
-
-        e.Remove<Color>(Ecs.Wildcard);
-        Assert.True(!e.Has(Color.Red));
-        Assert.True(!e.Has(Color.Green));
-        Assert.True(!e.Has(Color.Blue));
-        Assert.True(!e.Has<Color>(Ecs.Wildcard));
-        Assert.True(e.Table() != table);
-    }
-}
diff --git a/src/Flecs.NET/Core/BindingContext/Functions.cs b/src/Flecs.NET/Core/BindingContext/Functions.cs
index aa3bb289..2aa25379 100644
--- a/src/Flecs.NET/Core/BindingContext/Functions.cs
+++ b/src/Flecs.NET/Core/BindingContext/Functions.cs
@@ -1,1058 +1,1090 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Flecs.NET.Utilities;
-
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core.BindingContext;
-
-/// <summary>
-///     A static class for binding context functions.
-/// </summary>
-internal static unsafe partial class Functions
-{
-    #region Context Free
-
-    [UnmanagedCallersOnly]
-    internal static void WorldContextFree(void* context)
-    {
-        WorldContext.Free((WorldContext*)context);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void IteratorContextFree(void* context)
-    {
-        IteratorContext.Free((IteratorContext*)context);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void RunContextFree(void* context)
-    {
-        RunContext.Free((RunContext*)context);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void QueryContextFree(void* context)
-    {
-        QueryContext.Free((QueryContext*)context);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void GroupByContextFree(void* context)
-    {
-        GroupByContext.Free((GroupByContext*)context);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void TypeHooksContextFree(void* context)
-    {
-        TypeHooksContext.Free((TypeHooksContext*)context);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void UserContextFree(void* context)
-    {
-        UserContext.Free((UserContext*)context);
-    }
-
-    internal static void UserContextFinishDelegate<T>(ref UserContext context)
-    {
-        ((Ecs.UserContextFinish<T>)context.Callback.Delegate.Target!)(ref context.Get<T>());
-    }
-
-    internal static void UserContextFinishPointer<T>(ref UserContext context)
-    {
-        ((delegate*<ref T, void>)context.Callback.Pointer)(ref context.Get<T>());
-    }
-
-    #endregion
-
-    #region Iterator Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void IteratorCallback(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        ((delegate*<ecs_iter_t*, void>)context->Callback.Invoker)(iter);
-    }
-
-    internal static void ActionCallbackDelegate(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        ((Action)context->Callback.Delegate.Target!)();
-    }
-
-    internal static void ActionCallbackPointer(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        ((delegate*<void>)context->Callback.Pointer)();
-    }
-
-    internal static void IterCallbackDelegate(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterCallback)context->Callback.Delegate.Target!);
-    }
-
-    internal static void IterCallbackPointer(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, void>)context->Callback.Pointer);
-    }
-
-    internal static void EachEntityCallbackDelegate(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachEntityCallback)context->Callback.Delegate.Target!);
-    }
-
-    internal static void EachEntityCallbackPointer(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Entity, void>)context->Callback.Pointer);
-    }
-
-    internal static void EachIterCallbackDelegate(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachIterCallback)context->Callback.Delegate.Target!);
-    }
-
-    internal static void EachIterCallbackPointer(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Iter, int, void>)context->Callback.Pointer);
-    }
-
-    internal static void ObserveEntityCallbackDelegate(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (Ecs.ObserveEntityCallback)context->Callback.Delegate.Target!);
-    }
-
-    internal static void ObserveEntityCallbackPointer(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (delegate*<Entity, void>)context->Callback.Pointer);
-    }
-
-    internal static void ObserveRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (Ecs.ObserveRefCallback<T>)context->Callback.Delegate.Target!);
-    }
-
-    internal static void ObserveRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (delegate*<ref T, void>)context->Callback.Pointer);
-    }
-
-    internal static void ObservePointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (Ecs.ObservePointerCallback<T>)context->Callback.Delegate.Target!);
-    }
-
-    internal static void ObservePointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (delegate*<T*, void>)context->Callback.Pointer);
-    }
-
-    internal static void ObserveEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (Ecs.ObserveEntityRefCallback<T>)context->Callback.Delegate.Target!);
-    }
-
-    internal static void ObserveEntityRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (delegate*<Entity, ref T, void>)context->Callback.Pointer);
-    }
-
-    internal static void ObserveEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (Ecs.ObserveEntityPointerCallback<T>)context->Callback.Delegate.Target!);
-    }
-
-    internal static void ObserveEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
-        Invoker.Observe(iter, (delegate*<Entity, T*, void>)context->Callback.Pointer);
-    }
-
-    #endregion
-
-    #region Run Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void RunCallback(ecs_iter_t* iter)
-    {
-        RunContext* context = (RunContext*)iter->run_ctx;
-        ((delegate*<ecs_iter_t*, void>)context->Callback.Invoker)(iter);
-    }
-
-    internal static void RunCallbackDelegate(ecs_iter_t* iter)
-    {
-        RunContext* context = (RunContext*)iter->run_ctx;
-        Invoker.Run(iter, (Ecs.RunCallback)context->Callback.Delegate.Target!);
-    }
-
-    internal static void RunCallbackPointer(ecs_iter_t* iter)
-    {
-        RunContext* context = (RunContext*)iter->run_ctx;
-        Invoker.Run(iter, (delegate*<Iter, void>)context->Callback.Pointer);
-    }
-
-    internal static void RunDelegateCallbackDelegate(ecs_iter_t* iter)
-    {
-        RunContext* context = (RunContext*)iter->run_ctx;
-        Invoker.Run(iter, (Ecs.RunDelegateCallback)context->Callback.Delegate.Target!);
-    }
-
-    internal static void RunDelegateCallbackPointer(ecs_iter_t* iter)
-    {
-        RunContext* context = (RunContext*)iter->run_ctx;
-        Invoker.Run(iter, (delegate*<Iter, Action<Iter>, void>)context->Callback.Pointer);
-    }
-
-    internal static void RunPointerCallbackDelegate(ecs_iter_t* iter)
-    {
-        RunContext* context = (RunContext*)iter->run_ctx;
-        Invoker.Run(iter, (Ecs.RunPointerCallback)context->Callback.Delegate.Target!);
-    }
-
-    internal static void RunPointerCallbackPointer(ecs_iter_t* iter)
-    {
-        RunContext* context = (RunContext*)iter->run_ctx;
-        Invoker.Run(iter, (delegate*<Iter, delegate*<Iter, void>, void>)context->Callback.Pointer);
-    }
-
-    #endregion
-
-    #region Group By Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static ulong GroupByCallback(ecs_world_t* world, ecs_table_t* table, ulong id, void* context)
-    {
-        GroupByContext* groupByContext = (GroupByContext*)context;
-        return ((delegate*<ecs_world_t*, ecs_table_t*, ulong, GroupByContext*, ulong>)groupByContext->GroupBy.Invoker)(world, table, id, groupByContext);
-    }
-
-    internal static ulong GroupByCallbackDelegate(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
-    {
-        return ((Ecs.GroupByCallback)context->GroupBy.Delegate.Target!)(world, new Table(world, table), id);
-    }
-
-    internal static ulong GroupByCallbackPointer(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
-    {
-        return ((delegate*<World, Table, ulong, ulong>)context->GroupBy.Pointer)(world, new Table(world, table), id);
-    }
-
-    internal static ulong GroupByCallbackDelegate<T>(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
-    {
-        return ((Ecs.GroupByCallback<T>)context->GroupBy.Delegate.Target!)(world, new Table(world, table), id, ref context->GroupByUserContext.Get<T>());
-    }
-
-    internal static ulong GroupByCallbackPointer<T>(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
-    {
-        return ((delegate*<World, Table, ulong, ref T, ulong>)context->GroupBy.Pointer)(world, new Table(world, table), id, ref context->GroupByUserContext.Get<T>());
-    }
-
-    #endregion
-
-    #region Group Create Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void* GroupCreateCallback(ecs_world_t* world, ulong id, void* context)
-    {
-        GroupByContext* groupByContext = (GroupByContext*)context;
-        return ((delegate*<ecs_world_t*, ulong, GroupByContext*, void*>)groupByContext->GroupCreate.Invoker)(world, id, groupByContext);
-    }
-
-    internal static void* GroupCreateCallbackDelegate(ecs_world_t* world, ulong id, GroupByContext* context)
-    {
-        ((Ecs.GroupCreateCallback)context->GroupCreate.Delegate.Target!)(world, id);
-        return null;
-    }
-
-    internal static void* GroupCreateCallbackPointer(ecs_world_t* world, ulong id, GroupByContext* context)
-    {
-        ((delegate*<World, ulong, void>)context->GroupCreate.Pointer)(world, id);
-        return null;
-    }
-
-    internal static void* GroupCreateCallbackDelegate<T>(ecs_world_t* world, ulong id, GroupByContext* context)
-    {
-        ((Ecs.GroupCreateCallback<T>)context->GroupCreate.Delegate.Target!)(world, id, out T groupContext);
-        return UserContext.Alloc(ref groupContext);
-    }
-
-    internal static void* GroupCreateCallbackPointer<T>(ecs_world_t* world, ulong id, GroupByContext* context)
-    {
-        ((delegate*<World, ulong, out T, void>)context->GroupCreate.Pointer)(world, id, out T groupContext);
-        return UserContext.Alloc(ref groupContext);
-    }
-
-    #endregion
-
-    #region Group Delete Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void GroupDeleteCallback(ecs_world_t* world, ulong id, void* userContext, void* context)
-    {
-        GroupByContext* groupByContext = (GroupByContext*)context;
-        ((delegate*<ecs_world_t*, ulong, UserContext*, GroupByContext*, void>)groupByContext->GroupDelete.Invoker)(world, id, (UserContext*)userContext, groupByContext);
-    }
-
-    internal static void GroupDeleteCallbackDelegate(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
-    {
-        ((Ecs.GroupDeleteCallback)context->GroupDelete.Delegate.Target!)(world, id);
-
-        if (userContext == null)
-            return;
-
-        userContext->Dispose();
-        Memory.Free(userContext);
-    }
-
-    internal static void GroupDeleteCallbackPointer(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
-    {
-        ((delegate*<World, ulong, void>)context->GroupDelete.Pointer)(world, id);
-
-        if (userContext == null)
-            return;
-
-        userContext->Dispose();
-        Memory.Free(userContext);
-    }
-
-    internal static void GroupDeleteCallbackDelegate<T>(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
-    {
-        ((Ecs.GroupDeleteCallback<T>)context->GroupDelete.Delegate.Target!)(world, id, ref userContext->Get<T>());
-
-        if (userContext == null)
-            return;
-
-        userContext->Dispose();
-        Memory.Free(userContext);
-    }
-
-    internal static void GroupDeleteCallbackPointer<T>(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
-    {
-        ((delegate*<World, ulong, ref T, void>)context->GroupDelete.Pointer)(world, id, ref userContext->Get<T>());
-
-        if (userContext == null)
-            return;
-
-        userContext->Dispose();
-        Memory.Free(userContext);
-    }
-
-    #endregion
-
-    #region Post Frame Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void PostFrameCallback(ecs_world_t* world, void* ctx)
-    {
-        PostFrameContext* context = (PostFrameContext*)ctx;
-        ((delegate*<ecs_world_t*, void*, void>)context->Callback.Invoker)(world, ctx);
-    }
-
-    internal static void PostFrameCallbackDelegate(ecs_world_t* world, void* ctx)
-    {
-        PostFrameContext* context = (PostFrameContext*)ctx;
-        ((Ecs.PostFrameCallback)context->Callback.Delegate.Target!)(world);
-    }
-
-    internal static void PostFrameCallbackPointer(ecs_world_t* world, void* ctx)
-    {
-        PostFrameContext* context = (PostFrameContext*)ctx;
-        ((delegate*<World, void>)context->Callback.Pointer)(world);
-    }
-
-    #endregion
-
-    #region World Finish Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void WorldFinishCallback(ecs_world_t* world, void* ctx)
-    {
-        WorldFinishContext* context = (WorldFinishContext*)ctx;
-        ((delegate*<ecs_world_t*, void*, void>)context->Callback.Invoker)(world, ctx);
-    }
-
-    internal static void WorldFinishCallbackDelegate(ecs_world_t* world, void* ctx)
-    {
-        WorldFinishContext* context = (WorldFinishContext*)ctx;
-        ((Ecs.WorldFinishCallback)context->Callback.Delegate.Target!)(world);
-    }
-
-    internal static void WorldFinishCallbackPointer(ecs_world_t* world, void* ctx)
-    {
-        WorldFinishContext* context = (WorldFinishContext*)ctx;
-        ((delegate*<World, void>)context->Callback.Pointer)(world);
-    }
-
-    #endregion
-
-    #region App Init Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static int AppInitCallback(ecs_world_t* world)
-    {
-        WorldContext* context = new World(world).GetBindingContext();
-        ((delegate*<World, WorldContext*, void>)context->AppInit.Invoker)(world, context);
-        return 0;
-    }
-
-    internal static void AppInitCallbackDelegate(World world, WorldContext* context)
-    {
-        ((Ecs.AppInitCallback)context->AppInit.Delegate.Target!)(world);
-    }
-
-    internal static void AppInitCallbackPointer(World world, WorldContext* context)
-    {
-        ((delegate*<World, void>)context->AppInit.Pointer)(world);
-    }
-
-    #endregion
-
-    #region Os Api Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void AbortCallback()
-    {
-        ((delegate*<void>)Ecs.Os.Context.Abort.Invoker)();
-    }
-
-    internal static void AbortCallbackDelegate()
-    {
-        ((Action)Ecs.Os.Context.Abort.Delegate.Target!)();
-    }
-
-    internal static void AbortCallbackPointer()
-    {
-        ((delegate*<void>)Ecs.Os.Context.Abort.Pointer)();
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void LogCallback(int level, byte* file, int line, byte* message)
-    {
-        ((delegate*<int, byte*, int, byte*, void>)Ecs.Os.Context.Log.Invoker)(level, file, line, message);
-    }
-
-    internal static void LogCallbackDelegate(int level, byte* file, int line, byte* message)
-    {
-        ((Ecs.LogCallback)Ecs.Os.Context.Log.Delegate.Target!)(level, NativeString.GetString(file), line, NativeString.GetString(message));
-    }
-
-    internal static void LogCallbackPointer(int level, byte* file, int line, byte* message)
-    {
-        ((delegate*<int, string, int, string, void>)Ecs.Os.Context.Log.Pointer)(level, NativeString.GetString(file), line, NativeString.GetString(message));
-    }
-
-    #endregion
-
-    #region Resource Hook Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void CtorCallback(void* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        ((delegate*<void*, int, ecs_type_info_t*, void>)context->Ctor.Invoker)(data, count, typeInfo);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void DtorCallback(void* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        ((delegate*<void*, int, ecs_type_info_t*, void>)context->Dtor.Invoker)(data, count, typeInfo);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void MoveCallback(void* dst, void* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        ((delegate*<void*, void*, int, ecs_type_info_t*, void>)context->Move.Invoker)(dst, src, count, typeInfo);
-    }
-
-    [UnmanagedCallersOnly]
-    internal static void CopyCallback(void* dst, void* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        ((delegate*<void*, void*, int, ecs_type_info_t*, void>)context->Copy.Invoker)(dst, src, count, typeInfo);
-    }
-
-    internal static void DefaultManagedCtorCallback<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
-    {
-        for (int i = 0; i < count; i++)
-            data[i] = GCHandle.Alloc(new StrongBox<T>());
-    }
-
-    internal static void DefaultManagedDtorCallback<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
-    {
-        for (int i = 0; i < count; i++)
-            data[i].Free();
-    }
-
-    internal static void DefaultManagedMoveCallback<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
-    {
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
-            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
-            dstBox.Value = srcBox.Value!;
-        }
-    }
-
-    internal static void DefaultManagedCopyCallback<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
-    {
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
-            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
-            dstBox.Value = srcBox.Value!;
-        }
-    }
-
-    internal static void ManagedCtorCallbackDelegate<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.CtorCallback<T> callback = (Ecs.CtorCallback<T>)context->Ctor.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> box = new();
-            callback(ref box.Value!, new TypeInfo(typeInfo));
-            data[i] = GCHandle.Alloc(box);
-        }
-    }
-
-    internal static void ManagedCtorCallbackPointer<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Ctor.Pointer;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> box = new();
-            callback(ref box.Value!, new TypeInfo(typeInfo));
-            data[i] = GCHandle.Alloc(box);
-        }
-    }
-
-    internal static void ManagedDtorCallbackDelegate<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.DtorCallback<T> callback = (Ecs.DtorCallback<T>)context->Dtor.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> box = (StrongBox<T>)data[i].Target!;
-            callback(ref box.Value!, new TypeInfo(typeInfo));
-            data[i].Free();
-        }
-    }
-
-    internal static void ManagedDtorCallbackPointer<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Dtor.Pointer;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> box = (StrongBox<T>)data[i].Target!;
-            callback(ref box.Value!, new TypeInfo(typeInfo));
-            data[i].Free();
-        }
-    }
-
-    internal static void ManagedMoveCallbackDelegate<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.MoveCallback<T> callback = (Ecs.MoveCallback<T>)context->Move.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
-            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
-            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
-        }
-    }
-
-    internal static void ManagedMoveCallbackPointer<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Move.Pointer;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
-            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
-            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
-        }
-    }
-
-    internal static void ManagedCopyCallbackDelegate<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.CopyCallback<T> callback = (Ecs.CopyCallback<T>)context->Copy.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
-            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
-            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
-        }
-    }
-
-    internal static void ManagedCopyCallbackPointer<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Copy.Pointer;
-
-        for (int i = 0; i < count; i++)
-        {
-            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
-            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
-            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
-        }
-    }
-
-    internal static void UnmanagedCtorCallbackDelegate<T>(T* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.CtorCallback<T> callback = (Ecs.CtorCallback<T>)context->Ctor.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-            callback(ref data[i], new TypeInfo(typeInfo));
-    }
-
-    internal static void UnmanagedCtorCallbackPointer<T>(T* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Ctor.Pointer;
-
-        for (int i = 0; i < count; i++)
-            callback(ref data[i], new TypeInfo(typeInfo));
-    }
-
-    internal static void UnmanagedDtorCallbackDelegate<T>(T* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.DtorCallback<T> callback = (Ecs.DtorCallback<T>)context->Dtor.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-            callback(ref data[i], new TypeInfo(typeInfo));
-    }
-
-    internal static void UnmanagedDtorCallbackPointer<T>(T* data, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Dtor.Pointer;
-
-        for (int i = 0; i < count; i++)
-            callback(ref data[i], new TypeInfo(typeInfo));
-    }
-
-    internal static void UnmanagedMoveCallbackDelegate<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.MoveCallback<T> callback = (Ecs.MoveCallback<T>)context->Move.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
-    }
-
-    internal static void UnmanagedMoveCallbackPointer<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Move.Pointer;
-
-        for (int i = 0; i < count; i++)
-            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
-    }
-
-    internal static void UnmanagedCopyCallbackDelegate<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        Ecs.CopyCallback<T> callback = (Ecs.CopyCallback<T>)context->Copy.Delegate.Target!;
-
-        for (int i = 0; i < count; i++)
-            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
-    }
-
-    internal static void UnmanagedCopyCallbackPointer<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
-        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Copy.Pointer;
-
-        for (int i = 0; i < count; i++)
-            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
-    }
-
-    #endregion
-
-    #region OnAdd Hook Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void OnAddCallback(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        ((delegate*<ecs_iter_t*, void>)context->OnAdd.Invoker)(iter);
-    }
-
-    internal static void OnAddIterFieldCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterFieldCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddIterFieldCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, Field<T>, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddIterSpanCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterSpanCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddIterSpanCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, Span<T>, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterPointerCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddIterPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, T*, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddEachRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachRefCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddEachRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<ref T, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddEachEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachEntityRefCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddEachEntityRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Entity, ref T, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddEachIterRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachIterRefCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddEachIterRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Iter, int, ref T, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddEachPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachPointerCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddEachPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<T*, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddEachEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachEntityPointerCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddEachEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Entity, T*, void>)context->OnAdd.Pointer);
-    }
-
-    internal static void OnAddEachIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachIterPointerCallback<T>)context->OnAdd.Delegate.Target!);
-    }
-
-    internal static void OnAddEachIterPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Iter, int, T*, void>)context->OnAdd.Pointer);
-    }
-
-    #endregion
-
-    #region OnSet Hook Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void OnSetCallback(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        ((delegate*<ecs_iter_t*, void>)context->OnSet.Invoker)(iter);
-    }
-
-    internal static void OnSetIterFieldCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterFieldCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetIterFieldCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, Field<T>, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetIterSpanCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterSpanCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetIterSpanCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, Span<T>, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterPointerCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetIterPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, T*, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetEachRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachRefCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetEachRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<ref T, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetEachEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachEntityRefCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetEachEntityRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Entity, ref T, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetEachIterRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachIterRefCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetEachIterRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Iter, int, ref T, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetEachPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachPointerCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetEachPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<T*, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetEachEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachEntityPointerCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetEachEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Entity, T*, void>)context->OnSet.Pointer);
-    }
-
-    internal static void OnSetEachIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachIterPointerCallback<T>)context->OnSet.Delegate.Target!);
-    }
-
-    internal static void OnSetEachIterPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Iter, int, T*, void>)context->OnSet.Pointer);
-    }
-
-    #endregion
-
-    #region OnRemove Hook Callbacks
-
-    [UnmanagedCallersOnly]
-    internal static void OnRemoveCallback(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        ((delegate*<ecs_iter_t*, void>)context->OnRemove.Invoker)(iter);
-    }
-
-    internal static void OnRemoveIterFieldCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterFieldCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveIterFieldCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, Field<T>, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveIterSpanCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterSpanCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveIterSpanCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, Span<T>, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (Ecs.IterPointerCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveIterPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Iter(iter, (delegate*<Iter, T*, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveEachRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachRefCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveEachRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<ref T, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveEachEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachEntityRefCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveEachEntityRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Entity, ref T, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveEachIterRefCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachIterRefCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveEachIterRefCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Iter, int, ref T, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveEachPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachPointerCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveEachPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<T*, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveEachEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachEntityPointerCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveEachEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Entity, T*, void>)context->OnRemove.Pointer);
-    }
-
-    internal static void OnRemoveEachIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (Ecs.EachIterPointerCallback<T>)context->OnRemove.Delegate.Target!);
-    }
-
-    internal static void OnRemoveEachIterPointerCallbackPointer<T>(ecs_iter_t* iter)
-    {
-        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
-        Invoker.Each(iter, (delegate*<Iter, int, T*, void>)context->OnRemove.Pointer);
-    }
-
-    #endregion
-}
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Flecs.NET.Utilities;
+
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core.BindingContext;
+
+/// <summary>
+///     A static class for binding context functions.
+/// </summary>
+internal static unsafe partial class Functions
+{
+    #region Context Free
+
+    [UnmanagedCallersOnly]
+    internal static void WorldContextFree(void* context)
+    {
+        WorldContext.Free((WorldContext*)context);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void IteratorContextFree(void* context)
+    {
+        IteratorContext.Free((IteratorContext*)context);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void RunContextFree(void* context)
+    {
+        RunContext.Free((RunContext*)context);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void QueryContextFree(void* context)
+    {
+        QueryContext.Free((QueryContext*)context);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void GroupByContextFree(void* context)
+    {
+        GroupByContext.Free((GroupByContext*)context);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void TypeHooksContextFree(void* context)
+    {
+        TypeHooksContext.Free((TypeHooksContext*)context);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void UserContextFree(void* context)
+    {
+        UserContext.Free((UserContext*)context);
+    }
+
+    internal static void UserContextFinishDelegate<T>(ref UserContext context)
+    {
+        ((Ecs.UserContextFinish<T>)context.Callback.Delegate.Target!)(ref context.Get<T>());
+    }
+
+    internal static void UserContextFinishPointer<T>(ref UserContext context)
+    {
+        ((delegate*<ref T, void>)context.Callback.Pointer)(ref context.Get<T>());
+    }
+
+    #endregion
+
+    #region Iterator Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void IteratorCallback(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        ((delegate*<ecs_iter_t*, void>)context->Callback.Invoker)(iter);
+    }
+
+    internal static void ActionCallbackDelegate(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        ((Action)context->Callback.Delegate.Target!)();
+    }
+
+    internal static void ActionCallbackPointer(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        ((delegate*<void>)context->Callback.Pointer)();
+    }
+
+    internal static void IterCallbackDelegate(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterCallback)context->Callback.Delegate.Target!);
+    }
+
+    internal static void IterCallbackPointer(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, void>)context->Callback.Pointer);
+    }
+
+    internal static void EachEntityCallbackDelegate(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachEntityCallback)context->Callback.Delegate.Target!);
+    }
+
+    internal static void EachEntityCallbackPointer(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Entity, void>)context->Callback.Pointer);
+    }
+
+    internal static void EachIterCallbackDelegate(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachIterCallback)context->Callback.Delegate.Target!);
+    }
+
+    internal static void EachIterCallbackPointer(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Iter, int, void>)context->Callback.Pointer);
+    }
+
+    internal static void ObserveEntityCallbackDelegate(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (Ecs.ObserveEntityCallback)context->Callback.Delegate.Target!);
+    }
+
+    internal static void ObserveEntityCallbackPointer(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (delegate*<Entity, void>)context->Callback.Pointer);
+    }
+
+    internal static void ObserveRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (Ecs.ObserveRefCallback<T>)context->Callback.Delegate.Target!);
+    }
+
+    internal static void ObserveRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (delegate*<ref T, void>)context->Callback.Pointer);
+    }
+
+    internal static void ObservePointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (Ecs.ObservePointerCallback<T>)context->Callback.Delegate.Target!);
+    }
+
+    internal static void ObservePointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (delegate*<T*, void>)context->Callback.Pointer);
+    }
+
+    internal static void ObserveEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (Ecs.ObserveEntityRefCallback<T>)context->Callback.Delegate.Target!);
+    }
+
+    internal static void ObserveEntityRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (delegate*<Entity, ref T, void>)context->Callback.Pointer);
+    }
+
+    internal static void ObserveEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (Ecs.ObserveEntityPointerCallback<T>)context->Callback.Delegate.Target!);
+    }
+
+    internal static void ObserveEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        IteratorContext* context = (IteratorContext*)iter->callback_ctx;
+        Invoker.Observe(iter, (delegate*<Entity, T*, void>)context->Callback.Pointer);
+    }
+
+    #endregion
+
+    #region Run Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void RunCallback(ecs_iter_t* iter)
+    {
+        RunContext* context = (RunContext*)iter->run_ctx;
+        ((delegate*<ecs_iter_t*, void>)context->Callback.Invoker)(iter);
+    }
+
+    internal static void RunCallbackDelegate(ecs_iter_t* iter)
+    {
+        RunContext* context = (RunContext*)iter->run_ctx;
+        Invoker.Run(iter, (Ecs.RunCallback)context->Callback.Delegate.Target!);
+    }
+
+    internal static void RunCallbackPointer(ecs_iter_t* iter)
+    {
+        RunContext* context = (RunContext*)iter->run_ctx;
+        Invoker.Run(iter, (delegate*<Iter, void>)context->Callback.Pointer);
+    }
+
+    internal static void RunDelegateCallbackDelegate(ecs_iter_t* iter)
+    {
+        RunContext* context = (RunContext*)iter->run_ctx;
+        Invoker.Run(iter, (Ecs.RunDelegateCallback)context->Callback.Delegate.Target!);
+    }
+
+    internal static void RunDelegateCallbackPointer(ecs_iter_t* iter)
+    {
+        RunContext* context = (RunContext*)iter->run_ctx;
+        Invoker.Run(iter, (delegate*<Iter, Action<Iter>, void>)context->Callback.Pointer);
+    }
+
+    internal static void RunPointerCallbackDelegate(ecs_iter_t* iter)
+    {
+        RunContext* context = (RunContext*)iter->run_ctx;
+        Invoker.Run(iter, (Ecs.RunPointerCallback)context->Callback.Delegate.Target!);
+    }
+
+    internal static void RunPointerCallbackPointer(ecs_iter_t* iter)
+    {
+        RunContext* context = (RunContext*)iter->run_ctx;
+        Invoker.Run(iter, (delegate*<Iter, delegate*<Iter, void>, void>)context->Callback.Pointer);
+    }
+
+    #endregion
+
+    #region Group By Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static ulong GroupByCallback(ecs_world_t* world, ecs_table_t* table, ulong id, void* context)
+    {
+        GroupByContext* groupByContext = (GroupByContext*)context;
+        return ((delegate*<ecs_world_t*, ecs_table_t*, ulong, GroupByContext*, ulong>)groupByContext->GroupBy.Invoker)(world, table, id, groupByContext);
+    }
+
+    internal static ulong GroupByCallbackDelegate(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
+    {
+        return ((Ecs.GroupByCallback)context->GroupBy.Delegate.Target!)(world, new Table(world, table), id);
+    }
+
+    internal static ulong GroupByCallbackPointer(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
+    {
+        return ((delegate*<World, Table, ulong, ulong>)context->GroupBy.Pointer)(world, new Table(world, table), id);
+    }
+
+    internal static ulong GroupByCallbackDelegate<T>(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
+    {
+        return ((Ecs.GroupByCallback<T>)context->GroupBy.Delegate.Target!)(world, new Table(world, table), id, ref context->GroupByUserContext.Get<T>());
+    }
+
+    internal static ulong GroupByCallbackPointer<T>(ecs_world_t* world, ecs_table_t* table, ulong id, GroupByContext* context)
+    {
+        return ((delegate*<World, Table, ulong, ref T, ulong>)context->GroupBy.Pointer)(world, new Table(world, table), id, ref context->GroupByUserContext.Get<T>());
+    }
+
+    #endregion
+
+    #region Group Create Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void* GroupCreateCallback(ecs_world_t* world, ulong id, void* context)
+    {
+        GroupByContext* groupByContext = (GroupByContext*)context;
+        return ((delegate*<ecs_world_t*, ulong, GroupByContext*, void*>)groupByContext->GroupCreate.Invoker)(world, id, groupByContext);
+    }
+
+    internal static void* GroupCreateCallbackDelegate(ecs_world_t* world, ulong id, GroupByContext* context)
+    {
+        ((Ecs.GroupCreateCallback)context->GroupCreate.Delegate.Target!)(world, id);
+        return null;
+    }
+
+    internal static void* GroupCreateCallbackPointer(ecs_world_t* world, ulong id, GroupByContext* context)
+    {
+        ((delegate*<World, ulong, void>)context->GroupCreate.Pointer)(world, id);
+        return null;
+    }
+
+    internal static void* GroupCreateCallbackDelegate<T>(ecs_world_t* world, ulong id, GroupByContext* context)
+    {
+        ((Ecs.GroupCreateCallback<T>)context->GroupCreate.Delegate.Target!)(world, id, out T groupContext);
+        return UserContext.Alloc(ref groupContext);
+    }
+
+    internal static void* GroupCreateCallbackPointer<T>(ecs_world_t* world, ulong id, GroupByContext* context)
+    {
+        ((delegate*<World, ulong, out T, void>)context->GroupCreate.Pointer)(world, id, out T groupContext);
+        return UserContext.Alloc(ref groupContext);
+    }
+
+    #endregion
+
+    #region Group Delete Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void GroupDeleteCallback(ecs_world_t* world, ulong id, void* userContext, void* context)
+    {
+        GroupByContext* groupByContext = (GroupByContext*)context;
+        ((delegate*<ecs_world_t*, ulong, UserContext*, GroupByContext*, void>)groupByContext->GroupDelete.Invoker)(world, id, (UserContext*)userContext, groupByContext);
+    }
+
+    internal static void GroupDeleteCallbackDelegate(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
+    {
+        ((Ecs.GroupDeleteCallback)context->GroupDelete.Delegate.Target!)(world, id);
+
+        if (userContext == null)
+            return;
+
+        userContext->Dispose();
+        Memory.Free(userContext);
+    }
+
+    internal static void GroupDeleteCallbackPointer(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
+    {
+        ((delegate*<World, ulong, void>)context->GroupDelete.Pointer)(world, id);
+
+        if (userContext == null)
+            return;
+
+        userContext->Dispose();
+        Memory.Free(userContext);
+    }
+
+    internal static void GroupDeleteCallbackDelegate<T>(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
+    {
+        ((Ecs.GroupDeleteCallback<T>)context->GroupDelete.Delegate.Target!)(world, id, ref userContext->Get<T>());
+
+        if (userContext == null)
+            return;
+
+        userContext->Dispose();
+        Memory.Free(userContext);
+    }
+
+    internal static void GroupDeleteCallbackPointer<T>(ecs_world_t* world, ulong id, UserContext* userContext, GroupByContext* context)
+    {
+        ((delegate*<World, ulong, ref T, void>)context->GroupDelete.Pointer)(world, id, ref userContext->Get<T>());
+
+        if (userContext == null)
+            return;
+
+        userContext->Dispose();
+        Memory.Free(userContext);
+    }
+
+    #endregion
+
+    #region Post Frame Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void PostFrameCallback(ecs_world_t* world, void* ctx)
+    {
+        PostFrameContext* context = (PostFrameContext*)ctx;
+        ((delegate*<ecs_world_t*, void*, void>)context->Callback.Invoker)(world, ctx);
+    }
+
+    internal static void PostFrameCallbackDelegate(ecs_world_t* world, void* ctx)
+    {
+        PostFrameContext* context = (PostFrameContext*)ctx;
+        ((Ecs.PostFrameCallback)context->Callback.Delegate.Target!)(world);
+    }
+
+    internal static void PostFrameCallbackPointer(ecs_world_t* world, void* ctx)
+    {
+        PostFrameContext* context = (PostFrameContext*)ctx;
+        ((delegate*<World, void>)context->Callback.Pointer)(world);
+    }
+
+    #endregion
+
+    #region World Finish Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void WorldFinishCallback(ecs_world_t* world, void* ctx)
+    {
+        WorldFinishContext* context = (WorldFinishContext*)ctx;
+        ((delegate*<ecs_world_t*, void*, void>)context->Callback.Invoker)(world, ctx);
+    }
+
+    internal static void WorldFinishCallbackDelegate(ecs_world_t* world, void* ctx)
+    {
+        WorldFinishContext* context = (WorldFinishContext*)ctx;
+        ((Ecs.WorldFinishCallback)context->Callback.Delegate.Target!)(world);
+    }
+
+    internal static void WorldFinishCallbackPointer(ecs_world_t* world, void* ctx)
+    {
+        WorldFinishContext* context = (WorldFinishContext*)ctx;
+        ((delegate*<World, void>)context->Callback.Pointer)(world);
+    }
+
+    #endregion
+
+    #region App Init Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static int AppInitCallback(ecs_world_t* world)
+    {
+        WorldContext* context = new World(world).GetBindingContext();
+        ((delegate*<World, WorldContext*, void>)context->AppInit.Invoker)(world, context);
+        return 0;
+    }
+
+    internal static void AppInitCallbackDelegate(World world, WorldContext* context)
+    {
+        ((Ecs.AppInitCallback)context->AppInit.Delegate.Target!)(world);
+    }
+
+    internal static void AppInitCallbackPointer(World world, WorldContext* context)
+    {
+        ((delegate*<World, void>)context->AppInit.Pointer)(world);
+    }
+
+    #endregion
+
+    #region Os Api Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void AbortCallback()
+    {
+        ((delegate*<void>)Ecs.Os.Context.Abort.Invoker)();
+    }
+
+    internal static void AbortCallbackDelegate()
+    {
+        ((Action)Ecs.Os.Context.Abort.Delegate.Target!)();
+    }
+
+    internal static void AbortCallbackPointer()
+    {
+        ((delegate*<void>)Ecs.Os.Context.Abort.Pointer)();
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void LogCallback(int level, byte* file, int line, byte* message)
+    {
+        ((delegate*<int, byte*, int, byte*, void>)Ecs.Os.Context.Log.Invoker)(level, file, line, message);
+    }
+
+    internal static void LogCallbackDelegate(int level, byte* file, int line, byte* message)
+    {
+        ((Ecs.LogCallback)Ecs.Os.Context.Log.Delegate.Target!)(level, NativeString.GetString(file), line, NativeString.GetString(message));
+    }
+
+    internal static void LogCallbackPointer(int level, byte* file, int line, byte* message)
+    {
+        ((delegate*<int, string, int, string, void>)Ecs.Os.Context.Log.Pointer)(level, NativeString.GetString(file), line, NativeString.GetString(message));
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void TracePushCallback(byte* file, ulong line, byte* message)
+    {
+        ((delegate*<byte*, ulong, byte*, void>)Ecs.Os.Context.TracePush.Invoker)(file, line, message);
+    }
+
+    internal static void TracePushCallbackDelegate(byte* file, ulong line, byte* message)
+    {
+        ((Ecs.TraceCallback)Ecs.Os.Context.TracePush.Delegate.Target!)(NativeString.GetString(file), line, NativeString.GetString(message));
+    }
+
+    internal static void TracePushCallbackPointer(byte* file, ulong line, byte* message)
+    {
+        ((delegate*<string, ulong, string, void>)Ecs.Os.Context.TracePush.Pointer)(NativeString.GetString(file), line, NativeString.GetString(message));
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void TracePopCallback(byte* file, ulong line, byte* message)
+    {
+        ((delegate*<byte*, ulong, byte*, void>)Ecs.Os.Context.TracePop.Invoker)(file, line, message);
+    }
+
+    internal static void TracePopCallbackDelegate(byte* file, ulong line, byte* message)
+    {
+        ((Ecs.TraceCallback)Ecs.Os.Context.TracePop.Delegate.Target!)(NativeString.GetString(file), line, NativeString.GetString(message));
+    }
+
+    internal static void TracePopCallbackPointer(byte* file, ulong line, byte* message)
+    {
+        ((delegate*<string, ulong, string, void>)Ecs.Os.Context.TracePop.Pointer)(NativeString.GetString(file), line, NativeString.GetString(message));
+    }
+
+    #endregion
+
+    #region Resource Hook Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void CtorCallback(void* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        ((delegate*<void*, int, ecs_type_info_t*, void>)context->Ctor.Invoker)(data, count, typeInfo);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void DtorCallback(void* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        ((delegate*<void*, int, ecs_type_info_t*, void>)context->Dtor.Invoker)(data, count, typeInfo);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void MoveCallback(void* dst, void* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        ((delegate*<void*, void*, int, ecs_type_info_t*, void>)context->Move.Invoker)(dst, src, count, typeInfo);
+    }
+
+    [UnmanagedCallersOnly]
+    internal static void CopyCallback(void* dst, void* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        ((delegate*<void*, void*, int, ecs_type_info_t*, void>)context->Copy.Invoker)(dst, src, count, typeInfo);
+    }
+
+    internal static void DefaultManagedCtorCallback<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
+    {
+        for (int i = 0; i < count; i++)
+            data[i] = GCHandle.Alloc(new StrongBox<T>());
+    }
+
+    internal static void DefaultManagedDtorCallback<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
+    {
+        for (int i = 0; i < count; i++)
+            data[i].Free();
+    }
+
+    internal static void DefaultManagedMoveCallback<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
+    {
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
+            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
+            dstBox.Value = srcBox.Value!;
+        }
+    }
+
+    internal static void DefaultManagedCopyCallback<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
+    {
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
+            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
+            dstBox.Value = srcBox.Value!;
+        }
+    }
+
+    internal static void ManagedCtorCallbackDelegate<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.CtorCallback<T> callback = (Ecs.CtorCallback<T>)context->Ctor.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> box = new();
+            callback(ref box.Value!, new TypeInfo(typeInfo));
+            data[i] = GCHandle.Alloc(box);
+        }
+    }
+
+    internal static void ManagedCtorCallbackPointer<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Ctor.Pointer;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> box = new();
+            callback(ref box.Value!, new TypeInfo(typeInfo));
+            data[i] = GCHandle.Alloc(box);
+        }
+    }
+
+    internal static void ManagedDtorCallbackDelegate<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.DtorCallback<T> callback = (Ecs.DtorCallback<T>)context->Dtor.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> box = (StrongBox<T>)data[i].Target!;
+            callback(ref box.Value!, new TypeInfo(typeInfo));
+            data[i].Free();
+        }
+    }
+
+    internal static void ManagedDtorCallbackPointer<T>(GCHandle* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Dtor.Pointer;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> box = (StrongBox<T>)data[i].Target!;
+            callback(ref box.Value!, new TypeInfo(typeInfo));
+            data[i].Free();
+        }
+    }
+
+    internal static void ManagedMoveCallbackDelegate<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.MoveCallback<T> callback = (Ecs.MoveCallback<T>)context->Move.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
+            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
+            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
+        }
+    }
+
+    internal static void ManagedMoveCallbackPointer<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Move.Pointer;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
+            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
+            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
+        }
+    }
+
+    internal static void ManagedCopyCallbackDelegate<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.CopyCallback<T> callback = (Ecs.CopyCallback<T>)context->Copy.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
+            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
+            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
+        }
+    }
+
+    internal static void ManagedCopyCallbackPointer<T>(GCHandle* dst, GCHandle* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Copy.Pointer;
+
+        for (int i = 0; i < count; i++)
+        {
+            StrongBox<T> dstBox = (StrongBox<T>)dst[i].Target!;
+            StrongBox<T> srcBox = (StrongBox<T>)src[i].Target!;
+            callback(ref dstBox.Value!, ref srcBox.Value!, new TypeInfo(typeInfo));
+        }
+    }
+
+    internal static void UnmanagedCtorCallbackDelegate<T>(T* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.CtorCallback<T> callback = (Ecs.CtorCallback<T>)context->Ctor.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+            callback(ref data[i], new TypeInfo(typeInfo));
+    }
+
+    internal static void UnmanagedCtorCallbackPointer<T>(T* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Ctor.Pointer;
+
+        for (int i = 0; i < count; i++)
+            callback(ref data[i], new TypeInfo(typeInfo));
+    }
+
+    internal static void UnmanagedDtorCallbackDelegate<T>(T* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.DtorCallback<T> callback = (Ecs.DtorCallback<T>)context->Dtor.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+            callback(ref data[i], new TypeInfo(typeInfo));
+    }
+
+    internal static void UnmanagedDtorCallbackPointer<T>(T* data, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, TypeInfo, void> callback = (delegate*<ref T, TypeInfo, void>)context->Dtor.Pointer;
+
+        for (int i = 0; i < count; i++)
+            callback(ref data[i], new TypeInfo(typeInfo));
+    }
+
+    internal static void UnmanagedMoveCallbackDelegate<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.MoveCallback<T> callback = (Ecs.MoveCallback<T>)context->Move.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
+    }
+
+    internal static void UnmanagedMoveCallbackPointer<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Move.Pointer;
+
+        for (int i = 0; i < count; i++)
+            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
+    }
+
+    internal static void UnmanagedCopyCallbackDelegate<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        Ecs.CopyCallback<T> callback = (Ecs.CopyCallback<T>)context->Copy.Delegate.Target!;
+
+        for (int i = 0; i < count; i++)
+            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
+    }
+
+    internal static void UnmanagedCopyCallbackPointer<T>(T* dst, T* src, int count, ecs_type_info_t* typeInfo)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)typeInfo->hooks.binding_ctx;
+        delegate*<ref T, ref T, TypeInfo, void> callback = (delegate*<ref T, ref T, TypeInfo, void>)context->Copy.Pointer;
+
+        for (int i = 0; i < count; i++)
+            callback(ref dst[i], ref src[i], new TypeInfo(typeInfo));
+    }
+
+    #endregion
+
+    #region OnAdd Hook Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void OnAddCallback(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        ((delegate*<ecs_iter_t*, void>)context->OnAdd.Invoker)(iter);
+    }
+
+    internal static void OnAddIterFieldCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterFieldCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddIterFieldCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, Field<T>, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddIterSpanCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterSpanCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddIterSpanCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, Span<T>, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterPointerCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddIterPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, T*, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddEachRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachRefCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddEachRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<ref T, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddEachEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachEntityRefCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddEachEntityRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Entity, ref T, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddEachIterRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachIterRefCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddEachIterRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Iter, int, ref T, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddEachPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachPointerCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddEachPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<T*, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddEachEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachEntityPointerCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddEachEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Entity, T*, void>)context->OnAdd.Pointer);
+    }
+
+    internal static void OnAddEachIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachIterPointerCallback<T>)context->OnAdd.Delegate.Target!);
+    }
+
+    internal static void OnAddEachIterPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Iter, int, T*, void>)context->OnAdd.Pointer);
+    }
+
+    #endregion
+
+    #region OnSet Hook Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void OnSetCallback(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        ((delegate*<ecs_iter_t*, void>)context->OnSet.Invoker)(iter);
+    }
+
+    internal static void OnSetIterFieldCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterFieldCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetIterFieldCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, Field<T>, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetIterSpanCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterSpanCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetIterSpanCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, Span<T>, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterPointerCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetIterPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, T*, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetEachRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachRefCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetEachRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<ref T, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetEachEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachEntityRefCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetEachEntityRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Entity, ref T, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetEachIterRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachIterRefCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetEachIterRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Iter, int, ref T, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetEachPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachPointerCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetEachPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<T*, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetEachEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachEntityPointerCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetEachEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Entity, T*, void>)context->OnSet.Pointer);
+    }
+
+    internal static void OnSetEachIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachIterPointerCallback<T>)context->OnSet.Delegate.Target!);
+    }
+
+    internal static void OnSetEachIterPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Iter, int, T*, void>)context->OnSet.Pointer);
+    }
+
+    #endregion
+
+    #region OnRemove Hook Callbacks
+
+    [UnmanagedCallersOnly]
+    internal static void OnRemoveCallback(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        ((delegate*<ecs_iter_t*, void>)context->OnRemove.Invoker)(iter);
+    }
+
+    internal static void OnRemoveIterFieldCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterFieldCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveIterFieldCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, Field<T>, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveIterSpanCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterSpanCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveIterSpanCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, Span<T>, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (Ecs.IterPointerCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveIterPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Iter(iter, (delegate*<Iter, T*, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveEachRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachRefCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveEachRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<ref T, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveEachEntityRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachEntityRefCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveEachEntityRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Entity, ref T, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveEachIterRefCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachIterRefCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveEachIterRefCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Iter, int, ref T, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveEachPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachPointerCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveEachPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<T*, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveEachEntityPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachEntityPointerCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveEachEntityPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Entity, T*, void>)context->OnRemove.Pointer);
+    }
+
+    internal static void OnRemoveEachIterPointerCallbackDelegate<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (Ecs.EachIterPointerCallback<T>)context->OnRemove.Delegate.Target!);
+    }
+
+    internal static void OnRemoveEachIterPointerCallbackPointer<T>(ecs_iter_t* iter)
+    {
+        TypeHooksContext* context = (TypeHooksContext*)iter->callback_ctx;
+        Invoker.Each(iter, (delegate*<Iter, int, T*, void>)context->OnRemove.Pointer);
+    }
+
+    #endregion
+}
diff --git a/src/Flecs.NET/Core/BindingContext/OsApiContext.cs b/src/Flecs.NET/Core/BindingContext/OsApiContext.cs
index 39633324..49701ad7 100644
--- a/src/Flecs.NET/Core/BindingContext/OsApiContext.cs
+++ b/src/Flecs.NET/Core/BindingContext/OsApiContext.cs
@@ -1,30 +1,34 @@
-using System;
-using Flecs.NET.Utilities;
-
-namespace Flecs.NET.Core.BindingContext;
-
-internal unsafe struct OsApiContext : IDisposable
-{
-    public Callback Abort;
-    public Callback Log;
-
-    public void Dispose()
-    {
-        Abort.Dispose();
-        Log.Dispose();
-    }
-
-    public static void Free(OsApiContext* context)
-    {
-        if (context == null)
-            return;
-        context->Dispose();
-        Memory.Free(context);
-    }
-
-    public static void Free(ref OsApiContext context)
-    {
-        fixed (OsApiContext* ptr = &context)
-            Free(ptr);
-    }
-}
+using System;
+using Flecs.NET.Utilities;
+
+namespace Flecs.NET.Core.BindingContext;
+
+internal unsafe struct OsApiContext : IDisposable
+{
+    public Callback Abort;
+    public Callback Log;
+    public Callback TracePush;
+    public Callback TracePop;
+
+    public void Dispose()
+    {
+        Abort.Dispose();
+        Log.Dispose();
+        TracePush.Dispose();
+        TracePop.Dispose();
+    }
+
+    public static void Free(OsApiContext* context)
+    {
+        if (context == null)
+            return;
+        context->Dispose();
+        Memory.Free(context);
+    }
+
+    public static void Free(ref OsApiContext context)
+    {
+        fixed (OsApiContext* ptr = &context)
+            Free(ptr);
+    }
+}
diff --git a/src/Flecs.NET/Core/Ecs/Aliases.cs b/src/Flecs.NET/Core/Ecs/Aliases.cs
index 3ffefdfe..448f4b11 100644
--- a/src/Flecs.NET/Core/Ecs/Aliases.cs
+++ b/src/Flecs.NET/Core/Ecs/Aliases.cs
@@ -1,663 +1,662 @@
-#pragma warning disable CA1707, CA1708
-
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public static partial class Ecs
-{
-    // Enums
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsInOutDefault"/>
-    /// </summary>
-    public const ecs_inout_kind_t InOutDefault = EcsInOutDefault;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsInOutNone"/>
-    /// </summary>
-    public const ecs_inout_kind_t InOutNone = EcsInOutNone;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsInOutFilter"/>
-    /// </summary>
-    public const ecs_inout_kind_t InOutFilter = EcsInOutFilter;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsInOut"/>
-    /// </summary>
-    public const ecs_inout_kind_t InOut = EcsInOut;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsIn"/>
-    /// </summary>
-    public const ecs_inout_kind_t In = EcsIn;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsOut"/>
-    /// </summary>
-    public const ecs_inout_kind_t Out = EcsOut;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsAnd"/>
-    /// </summary>
-    public const ecs_oper_kind_t And = EcsAnd;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsOr"/>
-    /// </summary>
-    public const ecs_oper_kind_t Or = EcsOr;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsNot"/>
-    /// </summary>
-    public const ecs_oper_kind_t Not = EcsNot;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsOptional"/>
-    /// </summary>
-    public const ecs_oper_kind_t Optional = EcsOptional;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsAndFrom"/>
-    /// </summary>
-    public const ecs_oper_kind_t AndFrom = EcsAndFrom;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsOrFrom"/>
-    /// </summary>
-    public const ecs_oper_kind_t OrFrom = EcsOrFrom;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsNotFrom"/>
-    /// </summary>
-    public const ecs_oper_kind_t NotFrom = EcsNotFrom;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsQueryCacheDefault"/>
-    /// </summary>
-    public const ecs_query_cache_kind_t QueryCacheDefault = EcsQueryCacheDefault;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsQueryCacheAuto"/>
-    /// </summary>
-    public const ecs_query_cache_kind_t QueryCacheAuto = EcsQueryCacheAuto;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsQueryCacheAll"/>
-    /// </summary>
-    public const ecs_query_cache_kind_t QueryCacheAll = EcsQueryCacheAll;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsQueryCacheNone"/>
-    /// </summary>
-    public const ecs_query_cache_kind_t QueryCacheNone = EcsQueryCacheNone;
-
-
-    // Built-in term flags
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsSelf"/>
-    /// </summary>
-    public const ulong Self = EcsSelf;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsUp"/>
-    /// </summary>
-    public const ulong Up = EcsUp;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsTrav"/>
-    /// </summary>
-    public const ulong Trav = EcsTrav;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsCascade"/>
-    /// </summary>
-    public const ulong Cascade = EcsCascade;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsDesc"/>
-    /// </summary>
-    public const ulong Desc = EcsDesc;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsIsVariable"/>
-    /// </summary>
-    public const ulong IsVariable = EcsIsVariable;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsIsEntity"/>
-    /// </summary>
-    public const ulong IsEntity = EcsIsEntity;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsIsName"/>
-    /// </summary>
-    public const ulong IsName = EcsIsName;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsTraverseFlags"/>
-    /// </summary>
-    public const ulong TraverseFlags = EcsTraverseFlags;
-
-    /// <summary>
-    ///     Equivalent to <see cref="EcsTermRefFlags"/>
-    /// </summary>
-    public const ulong TermRefFlags = EcsTermRefFlags;
-
-    // Id bit flags
-
-    /// <summary>
-    ///     Reference to <see cref="ECS_PAIR"/>.
-    /// </summary>
-    public static ref ulong PAIR => ref ECS_PAIR;
-
-    /// <summary>
-    ///     Reference to <see cref="ECS_AUTO_OVERRIDE"/>.
-    /// </summary>
-    public static ref ulong AUTO_OVERRIDE => ref ECS_AUTO_OVERRIDE;
-
-    /// <summary>
-    ///     Reference to <see cref="ECS_TOGGLE"/>.
-    /// </summary>
-    public static ref ulong TOGGLE => ref ECS_TOGGLE;
-
-    // Built-in tags
-
-    /// <summary>
-    ///     Reference to <see cref="EcsQuery"/>.
-    /// </summary>
-    public static ref ulong Query => ref EcsQuery;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsObserver"/>.
-    /// </summary>
-    public static ref ulong Observer => ref EcsObserver;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPrivate"/>.
-    /// </summary>
-    public static ref ulong Private => ref EcsPrivate;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsModule"/>.
-    /// </summary>
-    public static ref ulong Module => ref EcsModule;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPrefab"/>.
-    /// </summary>
-    public static ref ulong Prefab => ref EcsPrefab;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsDisabled"/>.
-    /// </summary>
-    public static ref ulong Disabled => ref EcsDisabled;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsEmpty"/>.
-    /// </summary>
-    public static ref ulong Empty => ref EcsEmpty;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsMonitor"/>.
-    /// </summary>
-    public static ref ulong Monitor => ref EcsMonitor;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsSystem"/>.
-    /// </summary>
-    public static ref ulong System => ref EcsSystem;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDEcsPipelineID_"/>.
-    /// </summary>
-    public static ref ulong Pipeline => ref FLECS_IDEcsPipelineID_;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPhase"/>.
-    /// </summary>
-    public static ref ulong Phase => ref EcsPhase;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsConstant"/>.
-    /// </summary>
-    public static ref ulong Constant => ref EcsConstant;
-
-    // Built-in event tags
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnAdd"/>.
-    /// </summary>
-    public static ref ulong OnAdd => ref EcsOnAdd;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnRemove"/>.
-    /// </summary>
-    public static ref ulong OnRemove => ref EcsOnRemove;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnSet"/>.
-    /// </summary>
-    public static ref ulong OnSet => ref EcsOnSet;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnTableCreate"/>.
-    /// </summary>
-    public static ref ulong OnTableCreate => ref EcsOnTableCreate;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnTableDelete"/>.
-    /// </summary>
-    public static ref ulong OnTableDelete => ref EcsOnTableDelete;
-
-    // Built-in entity ids
-
-    /// <summary>
-    ///     Reference to <see cref="EcsFlecs"/>.
-    /// </summary>
-    public static ref ulong Flecs => ref EcsFlecs;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsFlecsCore"/>.
-    /// </summary>
-    public static ref ulong FlecsCore => ref EcsFlecsCore;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsWorld"/>.
-    /// </summary>
-    public static ref ulong World => ref EcsWorld;
-
-    // Component Traits
-
-    /// <summary>
-    ///     Reference to <see cref="EcsWildcard"/>.
-    /// </summary>
-    public static ref ulong Wildcard => ref EcsWildcard;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsAny"/>.
-    /// </summary>
-    public static ref ulong Any => ref EcsAny;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsThis"/>.
-    /// </summary>
-    public static ref ulong This => ref EcsThis;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsTransitive"/>.
-    /// </summary>
-    public static ref ulong Transitive => ref EcsTransitive;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsReflexive"/>.
-    /// </summary>
-    public static ref ulong Reflexive => ref EcsReflexive;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsFinal"/>.
-    /// </summary>
-    public static ref ulong Final => ref EcsFinal;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsInheritable"/>.
-    /// </summary>
-    public static ref ulong Inheritable => ref EcsInheritable;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPairIsTag"/>.
-    /// </summary>
-    public static ref ulong PairIsTag => ref EcsPairIsTag;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsExclusive"/>.
-    /// </summary>
-    public static ref ulong Exclusive => ref EcsExclusive;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsAcyclic"/>.
-    /// </summary>
-    public static ref ulong Acyclic => ref EcsAcyclic;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsTraversable"/>.
-    /// </summary>
-    public static ref ulong Traversable => ref EcsTraversable;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsSymmetric"/>.
-    /// </summary>
-    public static ref ulong Symmetric => ref EcsSymmetric;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsWith"/>.
-    /// </summary>
-    public static ref ulong With => ref EcsWith;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOneOf"/>.
-    /// </summary>
-    public static ref ulong OneOf => ref EcsOneOf;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsTrait"/>.
-    /// </summary>
-    public static ref ulong Trait => ref EcsTrait;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsRelationship"/>.
-    /// </summary>
-    public static ref ulong Relationship => ref EcsRelationship;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsTarget"/>.
-    /// </summary>
-    public static ref ulong Target => ref EcsTarget;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsCanToggle"/>.
-    /// </summary>
-    public static ref ulong CanToggle => ref EcsCanToggle;
-
-    // OnInstantiate Trait
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnInstantiate"/>.
-    /// </summary>
-    public static ref ulong OnInstantiate => ref EcsOnInstantiate;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOverride"/>.
-    /// </summary>
-    public static ref ulong Override => ref EcsOverride;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsInherit"/>.
-    /// </summary>
-    public static ref ulong Inherit => ref EcsInherit;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsDontInherit"/>.
-    /// </summary>
-    public static ref ulong DontInherit => ref EcsDontInherit;
-
-    // OnDelete/OnDeleteTarget Traits
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnDelete"/>.
-    /// </summary>
-    public static ref ulong OnDelete => ref EcsOnDelete;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnDeleteTarget"/>.
-    /// </summary>
-    public static ref ulong OnDeleteTarget => ref EcsOnDeleteTarget;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsRemove"/>.
-    /// </summary>
-    public static ref ulong Remove => ref EcsRemove;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsDelete"/>.
-    /// </summary>
-    public static ref ulong Delete => ref EcsDelete;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPanic"/>.
-    /// </summary>
-    public static ref ulong Panic => ref EcsPanic;
-
-    // Built-in relationships
-
-    /// <summary>
-    ///     Reference to <see cref="EcsIsA"/>.
-    /// </summary>
-    public static ref ulong IsA => ref EcsIsA;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsChildOf"/>.
-    /// </summary>
-    public static ref ulong ChildOf => ref EcsChildOf;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsDependsOn"/>.
-    /// </summary>
-    public static ref ulong DependsOn => ref EcsDependsOn;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsSlotOf"/>.
-    /// </summary>
-    public static ref ulong SlotOf => ref EcsSlotOf;
-
-    // Built-in identifiers
-
-    /// <summary>
-    ///     Reference to <see cref="EcsName"/>.
-    /// </summary>
-    public static ref ulong Name => ref EcsName;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsSymbol"/>.
-    /// </summary>
-    public static ref ulong Symbol => ref EcsSymbol;
-
-    // Storage
-
-    /// <summary>
-    ///     Reference to <see cref="EcsSparse"/>.
-    /// </summary>
-    public static ref ulong Sparse => ref EcsSparse;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsUnion"/>.
-    /// </summary>
-    public static ref ulong Union => ref EcsUnion;
-
-    // Built-in predicates for comparing entity ids in queries.
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPredEq"/>.
-    /// </summary>
-    public static ref ulong PredEq => ref EcsPredEq;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPredMatch"/>.
-    /// </summary>
-    public static ref ulong PredMatch => ref EcsPredMatch;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPredLookup"/>.
-    /// </summary>
-    public static ref ulong PredLookup => ref EcsPredLookup;
-
-    // Built-in marker entities for query scopes
-
-    /// <summary>
-    ///     Reference to <see cref="EcsScopeOpen"/>.
-    /// </summary>
-    public static ref ulong ScopeOpen => ref EcsScopeOpen;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsScopeClose"/>.
-    /// </summary>
-    public static ref ulong ScopeClose => ref EcsScopeClose;
-
-    // Built-in pipeline tags
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnStart"/>.
-    /// </summary>
-    public static ref ulong OnStart => ref EcsOnStart;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPreFrame"/>.
-    /// </summary>
-    public static ref ulong PreFrame => ref EcsPreFrame;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnLoad"/>.
-    /// </summary>
-    public static ref ulong OnLoad => ref EcsOnLoad;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPostLoad"/>.
-    /// </summary>
-    public static ref ulong PostLoad => ref EcsPostLoad;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPreUpdate"/>.
-    /// </summary>
-    public static ref ulong PreUpdate => ref EcsPreUpdate;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnUpdate"/>.
-    /// </summary>
-    public static ref ulong OnUpdate => ref EcsOnUpdate;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnValidate"/>.
-    /// </summary>
-    public static ref ulong OnValidate => ref EcsOnValidate;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPostUpdate"/>.
-    /// </summary>
-    public static ref ulong PostUpdate => ref EcsPostUpdate;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPreStore"/>.
-    /// </summary>
-    public static ref ulong PreStore => ref EcsPreStore;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsOnStore"/>.
-    /// </summary>
-    public static ref ulong OnStore => ref EcsOnStore;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsPostFrame"/>.
-    /// </summary>
-    public static ref ulong PostFrame => ref EcsPostFrame;
-
-    // Built-in reflection types
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_bool_tID_"/>.
-    /// </summary>
-    public static ref ulong Bool => ref FLECS_IDecs_bool_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_char_tID_"/>.
-    /// </summary>
-    public static ref ulong Char => ref FLECS_IDecs_char_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_byte_tID_"/>.
-    /// </summary>
-    public static ref ulong Byte => ref FLECS_IDecs_byte_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_u8_tID_"/>.
-    /// </summary>
-    public static ref ulong U8 => ref FLECS_IDecs_u8_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_u16_tID_"/>.
-    /// </summary>
-    public static ref ulong U16 => ref FLECS_IDecs_u16_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_u32_tID_"/>.
-    /// </summary>
-    public static ref ulong U32 => ref FLECS_IDecs_u32_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_u64_tID_"/>.
-    /// </summary>
-    public static ref ulong U64 => ref FLECS_IDecs_u64_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_uptr_tID_"/>.
-    /// </summary>
-    public static ref ulong Uptr => ref FLECS_IDecs_uptr_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_i8_tID_"/>.
-    /// </summary>
-    public static ref ulong I8 => ref FLECS_IDecs_i8_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_i16_tID_"/>.
-    /// </summary>
-    public static ref ulong I16 => ref FLECS_IDecs_i16_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_i32_tID_"/>.
-    /// </summary>
-    public static ref ulong I32 => ref FLECS_IDecs_i32_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_i64_tID_"/>.
-    /// </summary>
-    public static ref ulong I64 => ref FLECS_IDecs_i64_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_iptr_tID_"/>.
-    /// </summary>
-    public static ref ulong Iptr => ref FLECS_IDecs_iptr_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_f32_tID_"/>.
-    /// </summary>
-    public static ref ulong F32 => ref FLECS_IDecs_f32_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_f64_tID_"/>.
-    /// </summary>
-    public static ref ulong F64 => ref FLECS_IDecs_f64_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_string_tID_"/>.
-    /// </summary>
-    public static ref ulong String => ref FLECS_IDecs_string_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="FLECS_IDecs_entity_tID_"/>.
-    /// </summary>
-    public static ref ulong Entity => ref FLECS_IDecs_entity_tID_;
-
-    /// <summary>
-    ///     Reference to <see cref="EcsQuantity"/>.
-    /// </summary>
-    public static ref ulong Quantity => ref EcsQuantity;
-
-    /// <summary>
-    ///     Query must match prefabs.
-    /// </summary>
-    public const uint QueryMatchPrefab = EcsQueryMatchPrefab;
-
-    /// <summary>
-    ///     Query must match disabled entities.
-    /// </summary>
-    public const uint QueryMatchDisabled = EcsQueryMatchDisabled;
-
-    /// <summary>
-    ///     Query must match empty tables.
-    /// </summary>
-    public const uint QueryMatchEmptyTables = EcsQueryMatchEmptyTables;
-
-    /// <summary>
-    ///     Query may have unresolved entity identifiers.
-    /// </summary>
-    public const uint QueryAllowUnresolvedByName = EcsQueryAllowUnresolvedByName;
-
-    /// <summary>
-    ///     Query only returns whole tables (ignores toggle/member fields).
-    /// </summary>
-    public const uint QueryTableOnly = EcsQueryTableOnly;
-}
-
-#pragma warning restore CA1707, CA1708
+#pragma warning disable CA1707, CA1708
+
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public static partial class Ecs
+{
+    // Enums
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsInOutDefault"/>
+    /// </summary>
+    public const ecs_inout_kind_t InOutDefault = EcsInOutDefault;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsInOutNone"/>
+    /// </summary>
+    public const ecs_inout_kind_t InOutNone = EcsInOutNone;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsInOutFilter"/>
+    /// </summary>
+    public const ecs_inout_kind_t InOutFilter = EcsInOutFilter;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsInOut"/>
+    /// </summary>
+    public const ecs_inout_kind_t InOut = EcsInOut;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsIn"/>
+    /// </summary>
+    public const ecs_inout_kind_t In = EcsIn;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsOut"/>
+    /// </summary>
+    public const ecs_inout_kind_t Out = EcsOut;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsAnd"/>
+    /// </summary>
+    public const ecs_oper_kind_t And = EcsAnd;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsOr"/>
+    /// </summary>
+    public const ecs_oper_kind_t Or = EcsOr;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsNot"/>
+    /// </summary>
+    public const ecs_oper_kind_t Not = EcsNot;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsOptional"/>
+    /// </summary>
+    public const ecs_oper_kind_t Optional = EcsOptional;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsAndFrom"/>
+    /// </summary>
+    public const ecs_oper_kind_t AndFrom = EcsAndFrom;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsOrFrom"/>
+    /// </summary>
+    public const ecs_oper_kind_t OrFrom = EcsOrFrom;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsNotFrom"/>
+    /// </summary>
+    public const ecs_oper_kind_t NotFrom = EcsNotFrom;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsQueryCacheDefault"/>
+    /// </summary>
+    public const ecs_query_cache_kind_t QueryCacheDefault = EcsQueryCacheDefault;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsQueryCacheAuto"/>
+    /// </summary>
+    public const ecs_query_cache_kind_t QueryCacheAuto = EcsQueryCacheAuto;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsQueryCacheAll"/>
+    /// </summary>
+    public const ecs_query_cache_kind_t QueryCacheAll = EcsQueryCacheAll;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsQueryCacheNone"/>
+    /// </summary>
+    public const ecs_query_cache_kind_t QueryCacheNone = EcsQueryCacheNone;
+
+
+    // Built-in term flags
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsSelf"/>
+    /// </summary>
+    public const ulong Self = EcsSelf;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsUp"/>
+    /// </summary>
+    public const ulong Up = EcsUp;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsTrav"/>
+    /// </summary>
+    public const ulong Trav = EcsTrav;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsCascade"/>
+    /// </summary>
+    public const ulong Cascade = EcsCascade;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsDesc"/>
+    /// </summary>
+    public const ulong Desc = EcsDesc;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsIsVariable"/>
+    /// </summary>
+    public const ulong IsVariable = EcsIsVariable;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsIsEntity"/>
+    /// </summary>
+    public const ulong IsEntity = EcsIsEntity;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsIsName"/>
+    /// </summary>
+    public const ulong IsName = EcsIsName;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsTraverseFlags"/>
+    /// </summary>
+    public const ulong TraverseFlags = EcsTraverseFlags;
+
+    /// <summary>
+    ///     Equivalent to <see cref="EcsTermRefFlags"/>
+    /// </summary>
+    public const ulong TermRefFlags = EcsTermRefFlags;
+
+    // Id bit flags
+
+    /// <summary>
+    ///     Reference to <see cref="ECS_PAIR"/>.
+    /// </summary>
+    public static ref ulong PAIR => ref ECS_PAIR;
+
+    /// <summary>
+    ///     Reference to <see cref="ECS_AUTO_OVERRIDE"/>.
+    /// </summary>
+    public static ref ulong AUTO_OVERRIDE => ref ECS_AUTO_OVERRIDE;
+
+    /// <summary>
+    ///     Reference to <see cref="ECS_TOGGLE"/>.
+    /// </summary>
+    public static ref ulong TOGGLE => ref ECS_TOGGLE;
+
+    // Built-in tags
+
+    /// <summary>
+    ///     Reference to <see cref="EcsQuery"/>.
+    /// </summary>
+    public static ref ulong Query => ref EcsQuery;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsObserver"/>.
+    /// </summary>
+    public static ref ulong Observer => ref EcsObserver;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPrivate"/>.
+    /// </summary>
+    public static ref ulong Private => ref EcsPrivate;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsModule"/>.
+    /// </summary>
+    public static ref ulong Module => ref EcsModule;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPrefab"/>.
+    /// </summary>
+    public static ref ulong Prefab => ref EcsPrefab;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsDisabled"/>.
+    /// </summary>
+    public static ref ulong Disabled => ref EcsDisabled;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsEmpty"/>.
+    /// </summary>
+    public static ref ulong Empty => ref EcsEmpty;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsMonitor"/>.
+    /// </summary>
+    public static ref ulong Monitor => ref EcsMonitor;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsSystem"/>.
+    /// </summary>
+    public static ref ulong System => ref EcsSystem;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDEcsPipelineID_"/>.
+    /// </summary>
+    public static ref ulong Pipeline => ref FLECS_IDEcsPipelineID_;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPhase"/>.
+    /// </summary>
+    public static ref ulong Phase => ref EcsPhase;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsConstant"/>.
+    /// </summary>
+    public static ref ulong Constant => ref EcsConstant;
+
+    // Built-in event tags
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnAdd"/>.
+    /// </summary>
+    public static ref ulong OnAdd => ref EcsOnAdd;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnRemove"/>.
+    /// </summary>
+    public static ref ulong OnRemove => ref EcsOnRemove;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnSet"/>.
+    /// </summary>
+    public static ref ulong OnSet => ref EcsOnSet;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnTableCreate"/>.
+    /// </summary>
+    public static ref ulong OnTableCreate => ref EcsOnTableCreate;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnTableDelete"/>.
+    /// </summary>
+    public static ref ulong OnTableDelete => ref EcsOnTableDelete;
+
+    // Built-in entity ids
+
+    /// <summary>
+    ///     Reference to <see cref="EcsFlecs"/>.
+    /// </summary>
+    public static ref ulong Flecs => ref EcsFlecs;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsFlecsCore"/>.
+    /// </summary>
+    public static ref ulong FlecsCore => ref EcsFlecsCore;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsWorld"/>.
+    /// </summary>
+    public static ref ulong World => ref EcsWorld;
+
+    // Component Traits
+
+    /// <summary>
+    ///     Reference to <see cref="EcsWildcard"/>.
+    /// </summary>
+    public static ref ulong Wildcard => ref EcsWildcard;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsAny"/>.
+    /// </summary>
+    public static ref ulong Any => ref EcsAny;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsThis"/>.
+    /// </summary>
+    public static ref ulong This => ref EcsThis;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsTransitive"/>.
+    /// </summary>
+    public static ref ulong Transitive => ref EcsTransitive;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsReflexive"/>.
+    /// </summary>
+    public static ref ulong Reflexive => ref EcsReflexive;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsFinal"/>.
+    /// </summary>
+    public static ref ulong Final => ref EcsFinal;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsInheritable"/>.
+    /// </summary>
+    public static ref ulong Inheritable => ref EcsInheritable;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPairIsTag"/>.
+    /// </summary>
+    public static ref ulong PairIsTag => ref EcsPairIsTag;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsExclusive"/>.
+    /// </summary>
+    public static ref ulong Exclusive => ref EcsExclusive;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsAcyclic"/>.
+    /// </summary>
+    public static ref ulong Acyclic => ref EcsAcyclic;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsTraversable"/>.
+    /// </summary>
+    public static ref ulong Traversable => ref EcsTraversable;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsSymmetric"/>.
+    /// </summary>
+    public static ref ulong Symmetric => ref EcsSymmetric;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsWith"/>.
+    /// </summary>
+    public static ref ulong With => ref EcsWith;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOneOf"/>.
+    /// </summary>
+    public static ref ulong OneOf => ref EcsOneOf;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsTrait"/>.
+    /// </summary>
+    public static ref ulong Trait => ref EcsTrait;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsRelationship"/>.
+    /// </summary>
+    public static ref ulong Relationship => ref EcsRelationship;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsTarget"/>.
+    /// </summary>
+    public static ref ulong Target => ref EcsTarget;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsCanToggle"/>.
+    /// </summary>
+    public static ref ulong CanToggle => ref EcsCanToggle;
+
+    // OnInstantiate Trait
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnInstantiate"/>.
+    /// </summary>
+    public static ref ulong OnInstantiate => ref EcsOnInstantiate;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOverride"/>.
+    /// </summary>
+    public static ref ulong Override => ref EcsOverride;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsInherit"/>.
+    /// </summary>
+    public static ref ulong Inherit => ref EcsInherit;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsDontInherit"/>.
+    /// </summary>
+    public static ref ulong DontInherit => ref EcsDontInherit;
+
+    // OnDelete/OnDeleteTarget Traits
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnDelete"/>.
+    /// </summary>
+    public static ref ulong OnDelete => ref EcsOnDelete;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnDeleteTarget"/>.
+    /// </summary>
+    public static ref ulong OnDeleteTarget => ref EcsOnDeleteTarget;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsRemove"/>.
+    /// </summary>
+    public static ref ulong Remove => ref EcsRemove;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsDelete"/>.
+    /// </summary>
+    public static ref ulong Delete => ref EcsDelete;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPanic"/>.
+    /// </summary>
+    public static ref ulong Panic => ref EcsPanic;
+
+    // Built-in relationships
+
+    /// <summary>
+    ///     Reference to <see cref="EcsIsA"/>.
+    /// </summary>
+    public static ref ulong IsA => ref EcsIsA;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsChildOf"/>.
+    /// </summary>
+    public static ref ulong ChildOf => ref EcsChildOf;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsDependsOn"/>.
+    /// </summary>
+    public static ref ulong DependsOn => ref EcsDependsOn;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsSlotOf"/>.
+    /// </summary>
+    public static ref ulong SlotOf => ref EcsSlotOf;
+
+    public static ref ulong OrderedChildren => ref EcsOrderedChildren;
+
+    // Built-in identifiers
+
+    /// <summary>
+    ///     Reference to <see cref="EcsName"/>.
+    /// </summary>
+    public static ref ulong Name => ref EcsName;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsSymbol"/>.
+    /// </summary>
+    public static ref ulong Symbol => ref EcsSymbol;
+
+    // Storage
+
+    /// <summary>
+    ///     Reference to <see cref="EcsSparse"/>.
+    /// </summary>
+    public static ref ulong Sparse => ref EcsSparse;
+
+    public static ref ulong DontFragment => ref EcsDontFragment;
+
+    // Built-in predicates for comparing entity ids in queries.
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPredEq"/>.
+    /// </summary>
+    public static ref ulong PredEq => ref EcsPredEq;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPredMatch"/>.
+    /// </summary>
+    public static ref ulong PredMatch => ref EcsPredMatch;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPredLookup"/>.
+    /// </summary>
+    public static ref ulong PredLookup => ref EcsPredLookup;
+
+    // Built-in marker entities for query scopes
+
+    /// <summary>
+    ///     Reference to <see cref="EcsScopeOpen"/>.
+    /// </summary>
+    public static ref ulong ScopeOpen => ref EcsScopeOpen;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsScopeClose"/>.
+    /// </summary>
+    public static ref ulong ScopeClose => ref EcsScopeClose;
+
+    // Built-in pipeline tags
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnStart"/>.
+    /// </summary>
+    public static ref ulong OnStart => ref EcsOnStart;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPreFrame"/>.
+    /// </summary>
+    public static ref ulong PreFrame => ref EcsPreFrame;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnLoad"/>.
+    /// </summary>
+    public static ref ulong OnLoad => ref EcsOnLoad;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPostLoad"/>.
+    /// </summary>
+    public static ref ulong PostLoad => ref EcsPostLoad;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPreUpdate"/>.
+    /// </summary>
+    public static ref ulong PreUpdate => ref EcsPreUpdate;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnUpdate"/>.
+    /// </summary>
+    public static ref ulong OnUpdate => ref EcsOnUpdate;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnValidate"/>.
+    /// </summary>
+    public static ref ulong OnValidate => ref EcsOnValidate;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPostUpdate"/>.
+    /// </summary>
+    public static ref ulong PostUpdate => ref EcsPostUpdate;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPreStore"/>.
+    /// </summary>
+    public static ref ulong PreStore => ref EcsPreStore;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsOnStore"/>.
+    /// </summary>
+    public static ref ulong OnStore => ref EcsOnStore;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsPostFrame"/>.
+    /// </summary>
+    public static ref ulong PostFrame => ref EcsPostFrame;
+
+    // Built-in reflection types
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_bool_tID_"/>.
+    /// </summary>
+    public static ref ulong Bool => ref FLECS_IDecs_bool_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_char_tID_"/>.
+    /// </summary>
+    public static ref ulong Char => ref FLECS_IDecs_char_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_byte_tID_"/>.
+    /// </summary>
+    public static ref ulong Byte => ref FLECS_IDecs_byte_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_u8_tID_"/>.
+    /// </summary>
+    public static ref ulong U8 => ref FLECS_IDecs_u8_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_u16_tID_"/>.
+    /// </summary>
+    public static ref ulong U16 => ref FLECS_IDecs_u16_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_u32_tID_"/>.
+    /// </summary>
+    public static ref ulong U32 => ref FLECS_IDecs_u32_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_u64_tID_"/>.
+    /// </summary>
+    public static ref ulong U64 => ref FLECS_IDecs_u64_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_uptr_tID_"/>.
+    /// </summary>
+    public static ref ulong Uptr => ref FLECS_IDecs_uptr_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_i8_tID_"/>.
+    /// </summary>
+    public static ref ulong I8 => ref FLECS_IDecs_i8_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_i16_tID_"/>.
+    /// </summary>
+    public static ref ulong I16 => ref FLECS_IDecs_i16_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_i32_tID_"/>.
+    /// </summary>
+    public static ref ulong I32 => ref FLECS_IDecs_i32_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_i64_tID_"/>.
+    /// </summary>
+    public static ref ulong I64 => ref FLECS_IDecs_i64_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_iptr_tID_"/>.
+    /// </summary>
+    public static ref ulong Iptr => ref FLECS_IDecs_iptr_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_f32_tID_"/>.
+    /// </summary>
+    public static ref ulong F32 => ref FLECS_IDecs_f32_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_f64_tID_"/>.
+    /// </summary>
+    public static ref ulong F64 => ref FLECS_IDecs_f64_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_string_tID_"/>.
+    /// </summary>
+    public static ref ulong String => ref FLECS_IDecs_string_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="FLECS_IDecs_entity_tID_"/>.
+    /// </summary>
+    public static ref ulong Entity => ref FLECS_IDecs_entity_tID_;
+
+    /// <summary>
+    ///     Reference to <see cref="EcsQuantity"/>.
+    /// </summary>
+    public static ref ulong Quantity => ref EcsQuantity;
+
+    /// <summary>
+    ///     Query must match prefabs.
+    /// </summary>
+    public const uint QueryMatchPrefab = EcsQueryMatchPrefab;
+
+    /// <summary>
+    ///     Query must match disabled entities.
+    /// </summary>
+    public const uint QueryMatchDisabled = EcsQueryMatchDisabled;
+
+    /// <summary>
+    ///     Query must match empty tables.
+    /// </summary>
+    public const uint QueryMatchEmptyTables = EcsQueryMatchEmptyTables;
+
+    /// <summary>
+    ///     Query may have unresolved entity identifiers.
+    /// </summary>
+    public const uint QueryAllowUnresolvedByName = EcsQueryAllowUnresolvedByName;
+
+    /// <summary>
+    ///     Query only returns whole tables (ignores toggle/member fields).
+    /// </summary>
+    public const uint QueryTableOnly = EcsQueryTableOnly;
+}
+
+#pragma warning restore CA1707, CA1708
diff --git a/src/Flecs.NET/Core/Ecs/Delegates.cs b/src/Flecs.NET/Core/Ecs/Delegates.cs
index ed0445d8..03522604 100644
--- a/src/Flecs.NET/Core/Ecs/Delegates.cs
+++ b/src/Flecs.NET/Core/Ecs/Delegates.cs
@@ -1,166 +1,168 @@
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public static unsafe partial class Ecs
-{
-    /// <summary>
-    ///     App init callback.
-    /// </summary>
-    public delegate void AppInitCallback(World world);
-
-    /// <summary>
-    ///     Callback to be run before a user context object is released by flecs.
-    /// </summary>
-    /// <typeparam name="T">The user context type.</typeparam>
-    public delegate void UserContextFinish<T>(ref T value);
-
-    /// <summary>
-    ///     Ctor type hook callback.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void CtorCallback<T>(ref T data, TypeInfo typeInfo);
-
-    /// <summary>
-    ///     Dtor type hook callback.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void DtorCallback<T>(ref T data, TypeInfo typeInfo);
-
-    /// <summary>
-    ///     Move type hook callback.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void MoveCallback<T>(ref T dst, ref T src, TypeInfo typeInfo);
-
-    /// <summary>
-    ///     Copy type hook callback.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void CopyCallback<T>(ref T dst, ref T src, TypeInfo typeInfo);
-
-    /// <summary>
-    ///     Each entity callback.
-    /// </summary>
-    public delegate void EachEntityCallback(Entity entity);
-
-    /// <summary>
-    ///     Each id callback.
-    /// </summary>
-    public delegate void EachIdCallback(Id id);
-
-    /// <summary>
-    ///     Each index callback.
-    /// </summary>
-    public delegate void EachIterCallback(Iter it, int i);
-
-    /// <summary>
-    ///     Function signature that takes an <see cref="Entity"/> argument.
-    /// </summary>
-    public delegate void ObserveEntityCallback(Entity e);
-
-    /// <summary>
-    ///     Function signature that takes a ref T argument.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void ObserveRefCallback<T>(ref T component);
-
-    /// <summary>
-    ///     Function signature that takes a T* callback.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void ObservePointerCallback<T>(T* component);
-
-    /// <summary>
-    ///     Function signature that takes an <see cref="Entity"/> and a ref T argument.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void ObserveEntityRefCallback<T>(Entity e, ref T component);
-
-    /// <summary>
-    ///     Function signature that takes an <see cref="Entity"/> and a T* argument.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public delegate void ObserveEntityPointerCallback<T>(Entity e, T* component);
-
-    /// <summary>
-    ///     World finish callback.
-    /// </summary>
-    public delegate void WorldFinishCallback(World world);
-
-    /// <summary>
-    ///     Run post frame callback.
-    /// </summary>
-    public delegate void PostFrameCallback(World world);
-
-    /// <summary>
-    ///     GroupBy Callback.
-    /// </summary>
-    public delegate ulong GroupByCallback(World world, Table table, ulong group);
-
-    /// <summary>
-    ///     GroupBy Callback.
-    /// </summary>
-    public delegate ulong GroupByCallback<T>(World world, Table table, ulong group, ref T groupByContext);
-
-    /// <summary>
-    ///     Group create callback.
-    /// </summary>
-    public delegate void GroupCreateCallback(World world, ulong group);
-
-    /// <summary>
-    ///     Group create callback.
-    /// </summary>
-    public delegate void GroupCreateCallback<T>(World world, ulong group, out T groupContext);
-
-    /// <summary>
-    ///     Group delete action.
-    /// </summary>
-    public delegate void GroupDeleteCallback(World world, ulong group);
-
-    /// <summary>
-    ///     Group delete action.
-    /// </summary>
-    public delegate void GroupDeleteCallback<T>(World world, ulong group, ref T context);
-
-    /// <summary>
-    ///     Iter callback.
-    /// </summary>
-    public delegate void IterCallback(Iter it);
-
-    /// <summary>
-    ///     OrderBy action.
-    /// </summary>
-    public delegate int OrderByCallback(ulong e1, void* ptr1, ulong e2, void* ptr2);
-
-    /// <summary>
-    ///     A callback that takes a reference to a world.
-    /// </summary>
-    public delegate void WorldCallback(World world);
-
-    /// <summary>
-    ///     A callback that takes a reference to a term.
-    /// </summary>
-    public delegate void TermCallback(ref Term term);
-
-    /// <summary>
-    ///     Run callback.
-    /// </summary>
-    public delegate void RunCallback(Iter it);
-
-    /// <summary>
-    ///     Run delegate callback.
-    /// </summary>
-    public delegate void RunDelegateCallback(Iter it, Action<Iter> callback);
-
-    /// <summary>
-    ///     Run function pointer callback.
-    /// </summary>
-    public delegate void RunPointerCallback(Iter it, delegate*<Iter, void> callback);
-
-    /// <summary>
-    ///     Os api log callback.
-    /// </summary>
-    public delegate void LogCallback(int level, string file, int line, string message);
-}
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public static unsafe partial class Ecs
+{
+    /// <summary>
+    ///     App init callback.
+    /// </summary>
+    public delegate void AppInitCallback(World world);
+
+    /// <summary>
+    ///     Callback to be run before a user context object is released by flecs.
+    /// </summary>
+    /// <typeparam name="T">The user context type.</typeparam>
+    public delegate void UserContextFinish<T>(ref T value);
+
+    /// <summary>
+    ///     Ctor type hook callback.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void CtorCallback<T>(ref T data, TypeInfo typeInfo);
+
+    /// <summary>
+    ///     Dtor type hook callback.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void DtorCallback<T>(ref T data, TypeInfo typeInfo);
+
+    /// <summary>
+    ///     Move type hook callback.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void MoveCallback<T>(ref T dst, ref T src, TypeInfo typeInfo);
+
+    /// <summary>
+    ///     Copy type hook callback.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void CopyCallback<T>(ref T dst, ref T src, TypeInfo typeInfo);
+
+    /// <summary>
+    ///     Each entity callback.
+    /// </summary>
+    public delegate void EachEntityCallback(Entity entity);
+
+    /// <summary>
+    ///     Each id callback.
+    /// </summary>
+    public delegate void EachIdCallback(Id id);
+
+    /// <summary>
+    ///     Each index callback.
+    /// </summary>
+    public delegate void EachIterCallback(Iter it, int i);
+
+    /// <summary>
+    ///     Function signature that takes an <see cref="Entity"/> argument.
+    /// </summary>
+    public delegate void ObserveEntityCallback(Entity e);
+
+    /// <summary>
+    ///     Function signature that takes a ref T argument.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void ObserveRefCallback<T>(ref T component);
+
+    /// <summary>
+    ///     Function signature that takes a T* callback.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void ObservePointerCallback<T>(T* component);
+
+    /// <summary>
+    ///     Function signature that takes an <see cref="Entity"/> and a ref T argument.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void ObserveEntityRefCallback<T>(Entity e, ref T component);
+
+    /// <summary>
+    ///     Function signature that takes an <see cref="Entity"/> and a T* argument.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public delegate void ObserveEntityPointerCallback<T>(Entity e, T* component);
+
+    /// <summary>
+    ///     World finish callback.
+    /// </summary>
+    public delegate void WorldFinishCallback(World world);
+
+    /// <summary>
+    ///     Run post frame callback.
+    /// </summary>
+    public delegate void PostFrameCallback(World world);
+
+    /// <summary>
+    ///     GroupBy Callback.
+    /// </summary>
+    public delegate ulong GroupByCallback(World world, Table table, ulong group);
+
+    /// <summary>
+    ///     GroupBy Callback.
+    /// </summary>
+    public delegate ulong GroupByCallback<T>(World world, Table table, ulong group, ref T groupByContext);
+
+    /// <summary>
+    ///     Group create callback.
+    /// </summary>
+    public delegate void GroupCreateCallback(World world, ulong group);
+
+    /// <summary>
+    ///     Group create callback.
+    /// </summary>
+    public delegate void GroupCreateCallback<T>(World world, ulong group, out T groupContext);
+
+    /// <summary>
+    ///     Group delete action.
+    /// </summary>
+    public delegate void GroupDeleteCallback(World world, ulong group);
+
+    /// <summary>
+    ///     Group delete action.
+    /// </summary>
+    public delegate void GroupDeleteCallback<T>(World world, ulong group, ref T context);
+
+    /// <summary>
+    ///     Iter callback.
+    /// </summary>
+    public delegate void IterCallback(Iter it);
+
+    /// <summary>
+    ///     OrderBy action.
+    /// </summary>
+    public delegate int OrderByCallback(ulong e1, void* ptr1, ulong e2, void* ptr2);
+
+    /// <summary>
+    ///     A callback that takes a reference to a world.
+    /// </summary>
+    public delegate void WorldCallback(World world);
+
+    /// <summary>
+    ///     A callback that takes a reference to a term.
+    /// </summary>
+    public delegate void TermCallback(ref Term term);
+
+    /// <summary>
+    ///     Run callback.
+    /// </summary>
+    public delegate void RunCallback(Iter it);
+
+    /// <summary>
+    ///     Run delegate callback.
+    /// </summary>
+    public delegate void RunDelegateCallback(Iter it, Action<Iter> callback);
+
+    /// <summary>
+    ///     Run function pointer callback.
+    /// </summary>
+    public delegate void RunPointerCallback(Iter it, delegate*<Iter, void> callback);
+
+    /// <summary>
+    ///     Os api log callback.
+    /// </summary>
+    public delegate void LogCallback(int level, string file, int line, string message);
+
+    public delegate void TraceCallback(string file, ulong line, string message);
+}
diff --git a/src/Flecs.NET/Core/Ecs/OsApi.cs b/src/Flecs.NET/Core/Ecs/OsApi.cs
index a2ff2c35..c72a1427 100644
--- a/src/Flecs.NET/Core/Ecs/OsApi.cs
+++ b/src/Flecs.NET/Core/Ecs/OsApi.cs
@@ -1,97 +1,125 @@
-using System;
-using Flecs.NET.Core.BindingContext;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public static unsafe partial class Ecs
-{
-    /// <summary>
-    ///     Static class for overriding the os api.
-    /// </summary>
-    public static class Os
-    {
-        private static bool _initialized;
-
-        internal static OsApiContext Context;
-
-        /// <summary>
-        ///     Determines whether the abort function can be overriden by Flecs.NET. If set to false,
-        ///     the abort function provided by flecs will be used. This should be set before the first call
-        ///     to World.Create();
-        /// </summary>
-        public static bool OverrideAbort { get; set; } = true;
-
-        /// <summary>
-        ///     Determines whether the log function can be overriden by Flecs.NET. If set to false,
-        ///     the log provided by flecs will be used. This should be set before the first call
-        ///     to World.Create();
-        /// </summary>
-        public static bool OverrideLog { get; set; } = true;
-
-        /// <summary>
-        ///     Override the default os api.
-        /// </summary>
-        internal static void OverrideOsApi()
-        {
-            if (_initialized)
-                return;
-
-            ecs_os_init();
-
-            if (OverrideAbort)
-            {
-                if (Context.Abort == default)
-                    SetAbort(&DefaultAbort);
-
-                ecs_os_api.abort_ = &Functions.AbortCallback;
-            }
-
-            if (OverrideLog)
-                ecs_os_api.log_ = Context.Log == default ? ecs_os_api.log_ : &Functions.LogCallback;
-
-            _initialized = true;
-        }
-
-        /// <summary>
-        ///     Sets os api abort callback.
-        /// </summary>
-        /// <param name="callback">The callback.</param>
-        public static void SetAbort(Action callback)
-        {
-            Context.Abort.Set(callback, (delegate*<void>)&Functions.AbortCallbackDelegate);
-        }
-
-        /// <summary>
-        ///     Sets os api abort callback.
-        /// </summary>
-        /// <param name="callback">The callback.</param>
-        public static void SetAbort(delegate*<void> callback)
-        {
-            Context.Abort.Set(callback, (delegate*<void>)&Functions.AbortCallbackPointer);
-        }
-
-        /// <summary>
-        ///     Sets the os api log callback.
-        /// </summary>
-        /// <param name="callback">The callback.</param>
-        public static void SetLog(LogCallback callback)
-        {
-            Context.Log.Set(callback, (delegate*<int, byte*, int, byte*, void>)&Functions.LogCallbackDelegate);
-        }
-
-        /// <summary>
-        ///     Sets the os api log callback.
-        /// </summary>
-        /// <param name="callback">The callback.</param>
-        public static void SetLog(delegate*<int, string, int, string, void> callback)
-        {
-            Context.Log.Set(callback, (delegate*<int, byte*, int, byte*, void>)&Functions.LogCallbackPointer);
-        }
-
-        private static void DefaultAbort()
-        {
-            throw new NativeException("Application aborted from native code.");
-        }
-    }
-}
+using System;
+using Flecs.NET.Core.BindingContext;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public static unsafe partial class Ecs
+{
+    /// <summary>
+    ///     Static class for overriding the os api.
+    /// </summary>
+    public static class Os
+    {
+        private static bool _initialized;
+
+        internal static OsApiContext Context;
+
+        /// <summary>
+        ///     Determines whether the abort function can be overriden by Flecs.NET. If set to false,
+        ///     the abort function provided by flecs will be used. This should be set before the first call
+        ///     to World.Create();
+        /// </summary>
+        public static bool OverrideAbort { get; set; } = true;
+
+        /// <summary>
+        ///     Determines whether the log function can be overriden by Flecs.NET. If set to false,
+        ///     the log provided by flecs will be used. This should be set before the first call
+        ///     to World.Create();
+        /// </summary>
+        public static bool OverrideLog { get; set; } = true;
+
+        public static bool OverrideTrace { get; set; } = true;
+
+        /// <summary>
+        ///     Override the default os api.
+        /// </summary>
+        internal static void OverrideOsApi()
+        {
+            if (_initialized)
+                return;
+
+            ecs_os_init();
+
+            if (OverrideAbort)
+            {
+                if (Context.Abort == default)
+                    SetAbort(&DefaultAbort);
+
+                ecs_os_api.abort_ = &Functions.AbortCallback;
+            }
+
+            if (OverrideLog)
+                ecs_os_api.log_ = Context.Log == default ? ecs_os_api.log_ : &Functions.LogCallback;
+
+            if (OverrideTrace)
+            {
+                ecs_os_api.perf_trace_push_ = Context.Log == default ? ecs_os_api.perf_trace_push_ : &Functions.TracePushCallback;
+                ecs_os_api.perf_trace_push_ = Context.Log == default ? ecs_os_api.perf_trace_pop_ : &Functions.TracePopCallback;
+            }
+
+            _initialized = true;
+        }
+
+        /// <summary>
+        ///     Sets os api abort callback.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        public static void SetAbort(Action callback)
+        {
+            Context.Abort.Set(callback, (delegate*<void>)&Functions.AbortCallbackDelegate);
+        }
+
+        /// <summary>
+        ///     Sets os api abort callback.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        public static void SetAbort(delegate*<void> callback)
+        {
+            Context.Abort.Set(callback, (delegate*<void>)&Functions.AbortCallbackPointer);
+        }
+
+        /// <summary>
+        ///     Sets the os api log callback.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        public static void SetLog(LogCallback callback)
+        {
+            Context.Log.Set(callback, (delegate*<int, byte*, int, byte*, void>)&Functions.LogCallbackDelegate);
+        }
+
+        /// <summary>
+        ///     Sets the os api log callback.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        public static void SetLog(delegate*<int, string, int, string, void> callback)
+        {
+            Context.Log.Set(callback, (delegate*<int, byte*, int, byte*, void>)&Functions.LogCallbackPointer);
+        }
+
+        public static void SetTracePush(TraceCallback callback)
+        {
+            Context.TracePush.Set(callback, (delegate*<byte*, ulong, byte*, void>)&Functions.TracePushCallbackDelegate);
+        }
+
+        public static void SetTracePush(delegate*<string, ulong, string, void> callback)
+        {
+            Context.TracePush.Set(callback, (delegate*<byte*, ulong, byte*, void>)&Functions.TracePushCallbackPointer);
+        }
+
+        public static void SetTracePop(TraceCallback callback)
+        {
+            Context.TracePop.Set(callback, (delegate*<byte*, ulong, byte*, void>)&Functions.TracePopCallbackDelegate);
+        }
+
+        public static void SetTracePop(delegate*<string, ulong, string, void> callback)
+        {
+            Context.TracePop.Set(callback, (delegate*<byte*, ulong, byte*, void>)&Functions.TracePopCallbackPointer);
+        }
+
+        private static void DefaultAbort()
+        {
+            throw new NativeException("Application aborted from native code.");
+        }
+    }
+}
diff --git a/src/Flecs.NET/Core/Entity.cs b/src/Flecs.NET/Core/Entity.cs
index 4a242c42..dc3bdd1d 100644
--- a/src/Flecs.NET/Core/Entity.cs
+++ b/src/Flecs.NET/Core/Entity.cs
@@ -1,3686 +1,3694 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Flecs.NET.Core.BindingContext;
-using Flecs.NET.Utilities;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-/// <summary>
-///     A wrapper for working with entities.
-/// </summary>
-public unsafe partial struct Entity : IEquatable<Entity>, IEntity<Entity>
-{
-    private Id _id;
-
-    /// <summary>
-    ///     Reference to world.
-    /// </summary>
-    public ref ecs_world_t* World => ref _id.World;
-
-    /// <summary>
-    ///     Reference to id.
-    /// </summary>
-    public ref Id Id => ref _id;
-
-    ref Entity IEntity<Entity>.Entity => ref this;
-
-    /// <summary>
-    ///     Returns a null entity.
-    /// </summary>
-    /// <returns></returns>
-    public static Entity Null()
-    {
-        return default;
-    }
-
-    /// <summary>
-    ///     Returns a null entity for the provided world.
-    /// </summary>
-    /// <param name="world"></param>
-    /// <returns></returns>
-    public static Entity Null(ecs_world_t* world)
-    {
-        return new Entity(world, 0);
-    }
-
-    /// <summary>
-    ///     Creates an entity with the provided id.
-    /// </summary>
-    /// <param name="id"></param>
-    public Entity(ulong id)
-    {
-        _id = id;
-    }
-
-    /// <summary>
-    ///     Creates an entity for the provided world.
-    /// </summary>
-    /// <param name="world"></param>
-    public Entity(ecs_world_t* world)
-    {
-        if (ecs_get_scope(world) == 0 && ecs_get_with(world) == 0)
-        {
-            _id = new Id(world, ecs_new(world));
-        }
-        else
-        {
-            ecs_entity_desc_t desc = default;
-            _id = new Id(world, ecs_entity_init(world, &desc));
-        }
-    }
-
-    /// <summary>
-    ///     Creates an entity from the provided world and id.
-    /// </summary>
-    /// <param name="world"></param>
-    /// <param name="id"></param>
-    public Entity(ecs_world_t* world, ulong id)
-    {
-        _id = new Id(world, id);
-    }
-
-    /// <summary>
-    ///     Creates an entity from the provided world and name.
-    /// </summary>
-    /// <param name="world"></param>
-    /// <param name="name"></param>
-    public Entity(ecs_world_t* world, string name)
-    {
-        using NativeString nativeName = (NativeString)name;
-
-        ecs_entity_desc_t desc = default;
-        desc.name = nativeName;
-        desc.sep = Pointers.DefaultSeparator;
-        desc.root_sep = Pointers.DefaultSeparator;
-
-        _id = new Id(world, ecs_entity_init(world, &desc));
-    }
-
-    /// <summary>
-    ///     Check if entity is valid.
-    /// </summary>
-    /// <returns></returns>
-    public bool IsValid()
-    {
-        return World != null && ecs_is_valid(World, Id);
-    }
-
-    /// <summary>
-    ///     Check if entity is alive.
-    /// </summary>
-    /// <returns></returns>
-    public bool IsAlive()
-    {
-        return World != null && ecs_is_alive(World, Id);
-    }
-
-    /// <summary>
-    ///     Return the entity name.
-    /// </summary>
-    /// <returns></returns>
-    public string Name()
-    {
-        return NativeString.GetString(ecs_get_name(World, Id));
-    }
-
-    /// <summary>
-    ///     Return the entity symbol.
-    /// </summary>
-    /// <returns></returns>
-    public string Symbol()
-    {
-        return NativeString.GetString(ecs_get_symbol(World, Id));
-    }
-
-    /// <summary>
-    ///     Return the entity path.
-    /// </summary>
-    /// <param name="sep"></param>
-    /// <param name="initSep"></param>
-    /// <returns></returns>
-    public string Path(string sep = Ecs.DefaultSeparator, string initSep = Ecs.DefaultSeparator)
-    {
-        return PathFrom(0, sep, initSep);
-    }
-
-    /// <summary>
-    ///     Return the entity path relative to a parent.
-    /// </summary>
-    /// <param name="parent"></param>
-    /// <param name="sep"></param>
-    /// <param name="initSep"></param>
-    /// <returns></returns>
-    public string PathFrom(ulong parent, string sep = Ecs.DefaultSeparator, string initSep = Ecs.DefaultSeparator)
-    {
-        using NativeString nativeSep = (NativeString)sep;
-        using NativeString nativeInitSep = (NativeString)initSep;
-
-        return NativeString.GetStringAndFree(ecs_get_path_w_sep(World, parent, Id, nativeSep, nativeInitSep));
-    }
-
-    /// <summary>
-    ///     Return the entity path relative to a parent.
-    /// </summary>
-    /// <param name="sep"></param>
-    /// <param name="initSep"></param>
-    /// <typeparam name="TParent"></typeparam>
-    /// <returns></returns>
-    public string PathFrom<TParent>(string sep = Ecs.DefaultSeparator, string initSep = Ecs.DefaultSeparator)
-    {
-        return PathFrom(Type<TParent>.Id(World), sep, initSep);
-    }
-
-    /// <summary>
-    ///     Check if entity is enabled.
-    /// </summary>
-    /// <returns></returns>
-    public bool Enabled()
-    {
-        return !ecs_has_id(World, Id, EcsDisabled);
-    }
-
-    /// <summary>
-    ///     Checks if id is enabled.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public bool Enabled(ulong id)
-    {
-        return ecs_is_enabled_id(World, Id, id);
-    }
-
-    /// <summary>
-    ///     Checks if pair is enabled.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public bool Enabled(ulong first, ulong second)
-    {
-        return Enabled(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Checks if type is enabled.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Enabled<T>()
-    {
-        return Enabled(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Checks if type is enabled.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Enabled<T>(T value) where T : Enum
-    {
-        return Enabled<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Checks if pair is enabled.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public bool Enabled<TFirst>(ulong second)
-    {
-        return Enabled(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Checks if pair is enabled.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Enabled<TFirst, TSecond>()
-    {
-        return Enabled(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Checks if pair is enabled.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Enabled<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Enabled<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Checks if pair is enabled.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Enabled<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return EnabledSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Checks if pair is enabled.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool EnabledSecond<TSecond>(ulong first)
-    {
-        return Enabled(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Get the entity's type.
-    /// </summary>
-    /// <returns></returns>
-    public FlecsType Type()
-    {
-        return new FlecsType(World, ecs_get_type(World, Id));
-    }
-
-    /// <summary>
-    ///     Get the entity's table.
-    /// </summary>
-    /// <returns></returns>
-    public Table Table()
-    {
-        return new Table(World, ecs_get_table(World, Id));
-    }
-
-    /// <summary>
-    ///     Get table range for the entity.
-    /// </summary>
-    /// <returns></returns>
-    public Table Range()
-    {
-        ecs_record_t* r = ecs_record_find(World, Id);
-        return r != null ? new Table(World, r->table, Ecs.RecordToRow(r->row), 1) : new Table();
-    }
-
-    /// <summary>
-    ///     Iterate (component) ids of an entity.
-    /// </summary>
-    /// <param name="func"></param>
-    public void Each(Ecs.EachIdCallback func)
-    {
-        ecs_type_t* type = ecs_get_type(World, Id);
-
-        if (type == null)
-            return;
-
-        ulong* ids = type->array;
-        int count = type->count;
-
-        for (int i = 0; i < count; i++)
-            func(new Id(World, ids[i]));
-    }
-
-    /// <summary>
-    ///     Iterate matching pair ids of an entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <param name="func"></param>
-    public void Each(ulong first, ulong second, Ecs.EachIdCallback func)
-    {
-        ecs_world_t* realWorld = ecs_get_world(World);
-        ecs_table_t* table = ecs_get_table(World, Id);
-
-        if (table == null)
-            return;
-
-        ecs_type_t* type = ecs_table_get_type(table);
-
-        if (type == null)
-            return;
-
-        ulong pattern = first;
-
-        if (second != 0)
-            pattern = Ecs.Pair(first, second);
-
-        int cur = 0;
-        ulong* ids = type->array;
-
-        while (-1 != (cur = ecs_search_offset(realWorld, table, cur, pattern, null)))
-        {
-            func(new Id(World, ids[cur]));
-            cur++;
-        }
-    }
-
-    /// <summary>
-    ///     Iterate targets for a given relationship.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <param name="func"></param>
-    public void Each(ulong relation, Ecs.EachEntityCallback func)
-    {
-        Each(relation, EcsWildcard, id => { func(id.Second()); });
-    }
-
-    /// <summary>
-    ///     Iterate targets for a given relationship.
-    /// </summary>
-    /// <param name="func"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Each<TFirst>(Ecs.EachEntityCallback func)
-    {
-        Each(Type<TFirst>.Id(World), func);
-    }
-
-    /// <summary>
-    ///     Iterate targets for a given relationship.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Each<TFirst>(TFirst relation, Ecs.EachEntityCallback callback) where TFirst : Enum
-    {
-        Each(Type<TFirst>.Id(World, relation), callback);
-    }
-
-    /// <summary>
-    ///     Iterate children for entity.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <param name="callback"></param>
-    public void Children(ulong relation, Ecs.EachEntityCallback callback)
-    {
-        if (Id == EcsWildcard || Id == EcsAny)
-            return;
-
-        ecs_iter_t it = ecs_each_id(World, Ecs.Pair(relation, Id));
-        while (ecs_each_next(&it))
-            Invoker.Each(&it, callback);
-    }
-
-    /// <summary>
-    ///     Iterate children for entity.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="TRel"></typeparam>
-    public void Children<TRel>(Ecs.EachEntityCallback callback)
-    {
-        Children(Type<TRel>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     Iterate children for entity.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Children<TFirst>(TFirst relation, Ecs.EachEntityCallback callback) where TFirst : Enum
-    {
-        Children(Type<TFirst>.Id(World, relation), callback);
-    }
-
-    /// <summary>
-    ///     Iterate children for entity.
-    /// </summary>
-    /// <param name="callback"></param>
-    public void Children(Ecs.EachEntityCallback callback)
-    {
-        Children(EcsChildOf, callback);
-    }
-
-    /// <summary>
-    ///     Get pointer to component value.
-    /// </summary>
-    /// <param name="compId"></param>
-    /// <returns></returns>
-    public void* GetPtr(ulong compId)
-    {
-        return ecs_get_id(World, Id, compId);
-    }
-
-    /// <summary>
-    ///     Get pointer to component value from pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public void* GetPtr(ulong first, ulong second)
-    {
-        return GetPtr(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Get pointer to component value.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* GetPtr<T>() where T : unmanaged
-    {
-        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (T*)ecs_get_id(World, Id, Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Get pointer to component value from pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetPtr<TFirst>(ulong second) where TFirst : unmanaged
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-
-        if (!typeof(TFirst).IsEnum || (second != Ecs.Wildcard && second != Ecs.Any))
-            return (TFirst*)GetPtr(Ecs.Pair<TFirst>(second, World));
-
-        Entity target = Target<TFirst>();
-        return target == 0 ? null : (TFirst*)target.GetPtr(EcsConstant, Type<TFirst>.UnderlyingTypeId);
-    }
-
-    /// <summary>
-    ///     Get pointer to component value from pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetPtr<TFirst, TSecond>(TSecond second)
-        where TFirst : unmanaged
-        where TSecond : Enum
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TFirst*)GetPtr(Ecs.Pair<TFirst, TSecond>(second, World));
-    }
-
-    /// <summary>
-    ///     Get pointer to component value from pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetPtr<TFirst, TSecond>(TFirst first)
-        where TFirst : Enum
-        where TSecond : unmanaged
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TSecond*)GetPtr(Ecs.Pair<TFirst, TSecond>(first, World));
-    }
-
-    /// <summary>
-    ///     Get pointer to component value from pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TFirst*)GetPtr(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get pointer to component value from pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TSecond*)GetPtr(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get pointer to component value from pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TSecond*)GetPtr(Ecs.PairSecond<TSecond>(first, World));
-    }
-
-    /// <summary>
-    ///     Get managed reference to component value.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref readonly T Get<T>()
-    {
-        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<T>(ecs_get_id(World, Id, Type<T>.Id(World)));
-    }
-
-    /// <summary>
-    ///     Get managed reference to component value from pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref readonly TFirst Get<TFirst>(ulong second)
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-
-        if (!typeof(TFirst).IsEnum || (second != Ecs.Wildcard && second != Ecs.Any))
-            return ref Managed.GetTypeRef<TFirst>(GetPtr(Ecs.Pair<TFirst>(second, World)));
-
-        Entity target = Target<TFirst>();
-        return ref target == 0 ? ref Unsafe.NullRef<TFirst>() : ref Managed.GetTypeRef<TFirst>(target.GetPtr(EcsConstant, Type<TFirst>.UnderlyingTypeId));
-    }
-
-    /// <summary>
-    ///     Get managed reference to component value from pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TFirst Get<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TFirst>(GetPtr(Ecs.Pair<TFirst, TSecond>(second, World)));
-    }
-
-    /// <summary>
-    ///     Get managed reference to component value from pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TSecond Get<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TSecond>(GetPtr(Ecs.Pair<TFirst, TSecond>(first, World)));
-    }
-
-    /// <summary>
-    ///     Get managed reference to component value from pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TFirst GetFirst<TFirst, TSecond>()
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TFirst>(GetPtr(Ecs.Pair<TFirst, TSecond>(World)));
-    }
-
-    /// <summary>
-    ///     Get managed reference to component value from pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TSecond GetSecond<TFirst, TSecond>()
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TSecond>(GetPtr(Ecs.Pair<TFirst, TSecond>(World)));
-    }
-
-    /// <summary>
-    ///     Get managed reference to component value from pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TSecond GetSecond<TSecond>(ulong first)
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TSecond>(GetPtr(Ecs.PairSecond<TSecond>(first, World)));
-    }
-
-    /// <summary>
-    ///     Get mutable component value (untyped).
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public void* GetMutPtr(ulong id)
-    {
-        return ecs_get_mut_id(World, Id, id);
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair (untyped).
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public void* GetMutPtr(ulong first, ulong second)
-    {
-        return GetMutPtr(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Get mutable component value.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* GetMutPtr<T>() where T : unmanaged
-    {
-        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (T*)ecs_get_mut_id(World, Id, Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for the first element of a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetMutPtr<TFirst>(ulong second) where TFirst : unmanaged
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TFirst*)GetMutPtr(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetMutPtr<TFirst, TSecond>(TSecond second)
-        where TFirst : unmanaged
-        where TSecond : Enum
-    {
-        return GetMutPtr<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetMutPtr<TFirst, TSecond>(TFirst first)
-        where TFirst : Enum
-        where TSecond : unmanaged
-    {
-        return GetMutSecondPtr<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetMutFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TFirst*)GetMutPtr(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetMutSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TSecond*)GetMutPtr(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetMutSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TSecond*)GetMutPtr(Ecs.PairSecond<TSecond>(first, World));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref T GetMut<T>()
-    {
-        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<T>(ecs_get_mut_id(World, Id, Type<T>.Id(World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for the first element of a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref TFirst GetMut<TFirst>(ulong second)
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TFirst>(GetMutPtr(Ecs.Pair<TFirst>(second, World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst GetMut<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref GetMut<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond GetMut<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref GetMutSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst GetMutFirst<TFirst, TSecond>()
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TFirst>(GetMutPtr(Ecs.Pair<TFirst, TSecond>(World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond GetMutSecond<TFirst, TSecond>()
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TSecond>(GetMutPtr(Ecs.Pair<TFirst, TSecond>(World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond GetMutSecond<TSecond>(ulong first)
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TSecond>(GetMutPtr(Ecs.PairSecond<TSecond>(first, World)));
-    }
-
-    /// <summary>
-    ///     Get target for a given pair.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public Entity Target(ulong relation, int index = 0)
-    {
-        return new Entity(World, ecs_get_target(World, Id, relation, index));
-    }
-
-    /// <summary>
-    ///     Get target for a given pair.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Target<T>(int index = 0)
-    {
-        return new Entity(World, ecs_get_target(World, Id, Type<T>.Id(World), index));
-    }
-
-    /// <summary>
-    ///     Get the target of a pair for a given relationship id.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public Entity TargetFor(ulong relation, ulong id)
-    {
-        return new Entity(World, ecs_get_target_for_id(World, Id, relation, id));
-    }
-
-    /// <summary>
-    ///     Get the target of a pair for a given relationship id.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity TargetFor<T>(ulong relation)
-    {
-        return new Entity(World, TargetFor(relation, Type<T>.Id(World)));
-    }
-
-    /// <summary>
-    ///     Get the target of a pair for a given relationship id.
-    /// </summary>
-    /// <param name="relation"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Entity TargetFor<TFirst, TSecond>(ulong relation)
-    {
-        ulong pair = Ecs.Pair<TFirst, TSecond>(World);
-        return new Entity(World, TargetFor(relation, pair));
-    }
-
-    /// <summary>
-    ///     Get depth for given relationship.
-    /// </summary>
-    /// <param name="rel"></param>
-    /// <returns></returns>
-    public int Depth(ulong rel)
-    {
-        return ecs_get_depth(World, Id, rel);
-    }
-
-    /// <summary>
-    ///     Get depth for given relationship.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public int Depth<T>()
-    {
-        return Depth(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Get depth for given relationship.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public int Depth<T>(T value) where T : Enum
-    {
-        return Depth(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Get parent of entity.
-    /// </summary>
-    /// <returns></returns>
-    public Entity Parent()
-    {
-        return Target(EcsChildOf);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public Entity Lookup(string path, bool recursive = false)
-    {
-        Ecs.Assert(Id != 0, "Invalid lookup from null handle.");
-        using NativeString nativePath = (NativeString)path;
-        ulong id = ecs_lookup_path_w_sep(World, Id, nativePath,
-            Pointers.DefaultSeparator, Pointers.DefaultSeparator, recursive);
-        return new Entity(World, id);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, out Entity entity)
-    {
-        return TryLookup(path, false, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, bool recursive, out Entity entity)
-    {
-        return (entity = Lookup(path, recursive)) != 0;
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, out ulong entity)
-    {
-        return TryLookup(path, false, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, bool recursive, out ulong entity)
-    {
-        return (entity = Lookup(path, recursive)) != 0;
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public bool Has(ulong id)
-    {
-        return ecs_has_id(World, Id, id);
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public bool Has(ulong first, ulong second)
-    {
-        return Has(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Has<T>()
-    {
-        return ecs_has_id(World, Id, Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided enum constant.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Has<T>(T value) where T : Enum
-    {
-        return Has<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst>(ulong second)
-    {
-        return Has(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst, TSecond>()
-    {
-        return Has(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Has<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return HasSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Check if entity has the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool HasSecond<TSecond>(ulong first)
-    {
-        return Has(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public bool Owns(ulong id)
-    {
-        return ecs_owns_id(World, Id, id);
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public bool Owns(ulong first, ulong second)
-    {
-        return Owns(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Owns<T>()
-    {
-        return Owns(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided component.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Owns<T>(T value) where T : Enum
-    {
-        return Owns<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public bool Owns<TFirst>(ulong second)
-    {
-        return Owns(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Owns<TFirst, TSecond>()
-    {
-        return Owns(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Owns<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Owns<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Owns<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return OwnsSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Check if entity owns the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool OwnsSecond<TSecond>(ulong first)
-    {
-        return Owns(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Clones the entity.
-    /// </summary>
-    /// <param name="cloneValue"></param>
-    /// <param name="dstId"></param>
-    /// <returns></returns>
-    public Entity Clone(bool cloneValue = true, ulong dstId = 0)
-    {
-        if (dstId == 0)
-            dstId = ecs_new(World);
-
-        Entity dst = new Entity(World, dstId);
-        ecs_clone(World, dstId, Id, cloneValue);
-        return dst;
-    }
-
-    /// <summary>
-    ///     Return mutable entity handle for current stage.
-    /// </summary>
-    /// <param name="stage"></param>
-    /// <returns></returns>
-    public Entity Mut(ref World stage)
-    {
-        Ecs.Assert(!stage.IsReadOnly(), "Cannot use readonly world/stage to create mutable handle");
-        return new Entity(Id).SetStage(stage);
-    }
-
-    /// <summary>
-    ///     Return mutable entity handle for current iter.
-    /// </summary>
-    /// <param name="it"></param>
-    /// <returns></returns>
-    public Entity Mut(ref Iter it)
-    {
-        Ecs.Assert(!it.World().IsReadOnly(),
-            "Cannot use iterator created for readonly world/stage to create mutable handle");
-        return new Entity(Id).SetStage(it.World());
-    }
-
-    /// <summary>
-    ///     Return mutable entity handle for current entity.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public Entity Mut(ref Entity entity)
-    {
-        Ecs.Assert(!entity.CsWorld().IsReadOnly(),
-            "Cannot use entity created for readonly world/stage to create mutable handle");
-        return new Entity(Id).SetStage(entity.World);
-    }
-
-    /// <summary>
-    ///     Return mutable entity handle for current stage.
-    /// </summary>
-    /// <param name="stage"></param>
-    /// <returns></returns>
-    public Entity Mut(World stage)
-    {
-        return Mut(ref stage);
-    }
-
-    /// <summary>
-    ///     Return mutable entity handle for current iter.
-    /// </summary>
-    /// <param name="it"></param>
-    /// <returns></returns>
-    public Entity Mut(Iter it)
-    {
-        return Mut(ref it);
-    }
-
-    /// <summary>
-    ///     Return mutable entity handle for current entity.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public Entity Mut(Entity entity)
-    {
-        return Mut(ref entity);
-    }
-
-    private Entity SetStage(ecs_world_t* stage)
-    {
-        return new Entity(stage, Id);
-    }
-
-    /// <summary>
-    ///     Serializes the entity to a JSON string using the provided description.
-    /// </summary>
-    /// <param name="desc">The description settings for JSON serialization.</param>
-    /// <returns>A JSON string with the serialized entity data, or an empty string if failed.</returns>
-    public string ToJson(in EntityToJsonDesc desc)
-    {
-        fixed (ecs_entity_to_json_desc_t* ptr = &desc.Desc)
-        {
-            return NativeString.GetStringAndFree(ecs_entity_to_json(World, Id, ptr));
-        }
-    }
-
-    /// <summary>
-    ///     Serializes the entity to a JSON string.
-    /// </summary>
-    /// <returns>A JSON string with the serialized entity data, or an empty string if failed.</returns>
-    public string ToJson()
-    {
-        return NativeString.GetStringAndFree(ecs_entity_to_json(World, Id, null));
-    }
-
-    /// <summary>
-    ///     Returns the entity's doc name.
-    /// </summary>
-    /// <returns></returns>
-    public string DocName()
-    {
-        return NativeString.GetString(ecs_doc_get_name(World, Id));
-    }
-
-    /// <summary>
-    ///     Returns the entity's doc brief.
-    /// </summary>
-    /// <returns></returns>
-    public string DocBrief()
-    {
-        return NativeString.GetString(ecs_doc_get_brief(World, Id));
-    }
-
-    /// <summary>
-    ///     Returns the entity's doc detail.
-    /// </summary>
-    /// <returns></returns>
-    public string DocDetail()
-    {
-        return NativeString.GetString(ecs_doc_get_detail(World, Id));
-    }
-
-    /// <summary>
-    ///     Returns the entity's doc detail.
-    /// </summary>
-    /// <returns></returns>
-    public string DocLink()
-    {
-        return NativeString.GetString(ecs_doc_get_link(World, Id));
-    }
-
-    /// <summary>
-    ///     Returns the entity's doc color.
-    /// </summary>
-    /// <returns></returns>
-    public string DocColor()
-    {
-        return NativeString.GetString(ecs_doc_get_color(World, Id));
-    }
-
-    /// <summary>
-    ///     Returns the entity's doc uuid.
-    /// </summary>
-    /// <returns></returns>
-    public string DocUuid()
-    {
-        return NativeString.GetString(ecs_doc_get_uuid(World, Id));
-    }
-
-    /// <summary>
-    ///     Return number of alerts for entity.
-    /// </summary>
-    /// <param name="alert"></param>
-    /// <returns></returns>
-    public int AlertCount(ulong alert = 0)
-    {
-        return ecs_get_alert_count(World, Id, alert);
-    }
-
-    /// <summary>
-    ///     Convert entity to enum constant.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T ToConstant<T>() where T : unmanaged, Enum
-    {
-        T* ptr = (T*)GetPtr(Ecs.Constant, Type<T>.UnderlyingTypeId);
-        Ecs.Assert(ptr != null, "Entity is not a constant");
-        return *ptr;
-    }
-
-    /// <summary>
-    ///     Emits an event for this entity.
-    /// </summary>
-    /// <param name="eventId"></param>
-    public void Emit(ulong eventId)
-    {
-        new World(World)
-            .Event(eventId)
-            .Entity(Id)
-            .Emit();
-    }
-
-    /// <summary>
-    ///     Emits an event for this entity.
-    /// </summary>
-    /// <param name="eventId"></param>
-    public void Emit(Entity eventId)
-    {
-        Emit(eventId.Id.Value);
-    }
-
-    /// <summary>
-    ///     Emits an event for this entity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Emit<T>()
-    {
-        Emit(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Emits an event for this entity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Emit<T>(T payload) where T : unmanaged
-    {
-        new World(World)
-            .Event(Type<T>.Id(World))
-            .Entity(Id)
-            .Ctx(&payload)
-            .Emit();
-    }
-
-    /// <summary>
-    ///     Emits an event for this entity.
-    /// </summary>
-    /// <param name="payload"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Emit<T>(ref T payload)
-    {
-        fixed (T* ptr = &payload)
-        {
-            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-            {
-                Managed.AllocGcHandle(ptr, out GCHandle handle);
-
-                new World(World)
-                    .Event(Type<T>.Id(World))
-                    .Entity(Id)
-                    .Ctx(&handle)
-                    .Emit();
-
-                Managed.FreeGcHandle(handle);
-            }
-            else
-            {
-                new World(World)
-                    .Event(Type<T>.Id(World))
-                    .Entity(Id)
-                    .Ctx(ptr)
-                    .Emit();
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Enqueues an event for this entity.
-    /// </summary>
-    /// <param name="eventId"></param>
-    public void Enqueue(ulong eventId)
-    {
-        new World(World)
-            .Event(eventId)
-            .Entity(Id)
-            .Enqueue();
-    }
-
-    /// <summary>
-    ///     Enqueues an event for this entity.
-    /// </summary>
-    /// <param name="eventId"></param>
-    public void Enqueue(Entity eventId)
-    {
-        Enqueue(eventId.Id.Value);
-    }
-
-    /// <summary>
-    ///     Enqueues an event for this entity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Enqueue<T>()
-    {
-        Enqueue(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Enqueues an event for this entity.
-    /// </summary>
-    /// <param name="payload"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Enqueue<T>(T payload) where T : unmanaged
-    {
-        new World(World)
-            .Event(Type<T>.Id(World))
-            .Entity(Id)
-            .Ctx(&payload)
-            .Enqueue();
-    }
-
-    /// <summary>
-    ///     Enqueues an event for this entity.
-    /// </summary>
-    /// <param name="payload"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Enqueue<T>(ref T payload)
-    {
-        fixed (T* ptr = &payload)
-        {
-            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-            {
-                Managed.AllocGcHandle(ptr, out GCHandle handle);
-
-                new World(World)
-                    .Event(Type<T>.Id(World))
-                    .Entity(Id)
-                    .Ctx(&handle)
-                    .Enqueue();
-
-                Managed.FreeGcHandle(handle);
-            }
-            else
-            {
-                new World(World)
-                    .Event(Type<T>.Id(World))
-                    .Entity(Id)
-                    .Ctx(ptr)
-                    .Enqueue();
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Short for Has(EcsChildOf, entity).
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public bool IsChildOf(ulong entity)
-    {
-        Ecs.Assert(!Ecs.IsPair(entity), "Cannot use pairs as an argument.");
-        return Has(EcsChildOf, entity);
-    }
-
-    /// <summary>
-    ///     Short for Has(EcsChildOf, entity).
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool IsChildOf<T>()
-    {
-        return IsChildOf(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Short for Has(EcsChildOf, entity).
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool IsChildOf<T>(T value) where T : Enum
-    {
-        return IsChildOf(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Add an entity to entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity Add(ulong id)
-    {
-        Ecs.Assert(ecs_id_is_valid(World, id), nameof(ECS_INVALID_OPERATION));
-        ecs_add_id(World, Id, id);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Add pair to entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity Add(ulong first, ulong second)
-    {
-        return ref Add(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Add a component to entity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Add<T>()
-    {
-        return ref Add(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Add a pair to entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref Entity Add<TFirst>(ulong second)
-    {
-        return ref Add(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Add an enum to entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Add<T>(T value) where T : Enum
-    {
-        return ref Add<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Add a pair to entity.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Add<TFirst, TSecond>()
-    {
-        return ref Add<TFirst>(Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Add a pair to entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Add<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Add<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Add a pair to entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Add<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref AddSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Add a pair to entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddSecond<TSecond>(ulong first)
-    {
-        return ref Add(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Conditionally adds an entity to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity AddIf(bool cond, ulong id)
-    {
-        return ref cond ? ref Add(id) : ref Remove(id);
-    }
-
-    /// <summary>
-    ///     Conditionally adds a pair to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity AddIf(bool cond, ulong first, ulong second)
-    {
-        if (cond)
-            return ref Add(first, second);
-
-        if (second == 0 || ecs_has_id(World, first, EcsExclusive))
-            second = EcsWildcard;
-
-        return ref Remove(first, second);
-    }
-
-    /// <summary>
-    ///     Conditionally adds a component to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddIf<T>(bool cond)
-    {
-        return ref cond ? ref Add<T>() : ref Remove<T>();
-    }
-
-    /// <summary>
-    ///     Conditionally adds an enum to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddIf<T>(bool cond, T value) where T : Enum
-    {
-        return ref AddIf<T>(cond, Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Conditionally adds a pair to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddIf<TFirst>(bool cond, ulong second)
-    {
-        return ref AddIf(cond, Type<TFirst>.Id(World), second);
-    }
-
-    /// <summary>
-    ///     Conditionally adds a pair to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddIf<TFirst, TSecond>(bool cond)
-    {
-        return ref AddIf<TFirst>(cond, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Conditionally adds a pair to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddIf<TFirst, TSecond>(bool cond, TSecond second) where TSecond : Enum
-    {
-        return ref AddIf<TFirst>(cond, Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Conditionally adds a pair to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddIf<TFirst, TSecond>(bool cond, TFirst first) where TFirst : Enum
-    {
-        return ref AddIfSecond<TSecond>(cond, Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Conditionally adds a pair to entity.
-    /// </summary>
-    /// <param name="cond"></param>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AddIfSecond<TSecond>(bool cond, ulong first)
-    {
-        return ref AddIf(cond, first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsIsA, entity).
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity IsA(ulong id)
-    {
-        return ref Add(EcsIsA, id);
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsIsA, entity).
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity IsA<T>()
-    {
-        return ref Add(EcsIsA, Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsIsA, entity).
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity IsA<T>(T value) where T : Enum
-    {
-        return ref IsA(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsChildOf, entity).
-    /// </summary>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity ChildOf(ulong second)
-    {
-        return ref Add(EcsChildOf, second);
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsChildOf, entity).
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity ChildOf<T>()
-    {
-        return ref Add(EcsChildOf, Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsChildOf, entity).
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity ChildOf<T>(T value) where T : Enum
-    {
-        return ref ChildOf(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcDependsOn, entity).
-    /// </summary>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity DependsOn(ulong second)
-    {
-        return ref Add(EcsDependsOn, second);
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcDependsOn, entity).
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity DependsOn<T>()
-    {
-        return ref DependsOn(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcDependsOn, entity).
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity DependsOn<T>(T value) where T : Enum
-    {
-        return ref DependsOn(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsSlotOf, entity).
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity SlotOf(ulong id)
-    {
-        return ref Add(EcsSlotOf, id);
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsSlotOf, entity).
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity SlotOf<T>()
-    {
-        return ref Add(EcsSlotOf, Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsSlotOf, entity).
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity SlotOf<T>(T value) where T : Enum
-    {
-        return ref SlotOf(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Shortcut for Add(EcsSlotOf, Target(EcsChildOf)).
-    /// </summary>
-    /// <returns></returns>
-    public ref Entity Slot()
-    {
-        Ecs.Assert(ecs_get_target(World, Id, EcsChildOf, 0) != 0, "Add ChildOf pair before using slot()");
-        return ref SlotOf(Target(EcsChildOf));
-    }
-
-    /// <summary>
-    ///     Remove an entity from entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity Remove(ulong id)
-    {
-        ecs_remove_id(World, Id, id);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Remove a pair from entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity Remove(ulong first, ulong second)
-    {
-        return ref Remove(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Remove a component from entity. If the provided type argument is an enum,
-    ///     this operation will remove any (Enum, *) pair from the entity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Remove<T>()
-    {
-        return ref Remove(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Remove an enum from entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Remove<T>(T value) where T : Enum
-    {
-        return ref Remove<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Remove a pair from entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref Entity Remove<TFirst>(ulong second)
-    {
-        return ref Remove(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Remove a pair from entity.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Remove<TFirst, TSecond>()
-    {
-        return ref Remove(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Remove a pair from entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Remove<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Remove<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Remove a pair from entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Remove<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref RemoveSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Remove a pair from entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity RemoveSecond<TSecond>(ulong first)
-    {
-        return ref Remove(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Mark id for auto-overriding.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity AutoOverride(ulong id)
-    {
-        ecs_add_id(World, Id, ECS_AUTO_OVERRIDE | id);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Mark a pair for auto-overriding.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity AutoOverride(ulong first, ulong second)
-    {
-        return ref AutoOverride(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Mark a component or auto-overriding.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity AutoOverride<T>()
-    {
-        return ref AutoOverride(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Mark a component or auto-overriding.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity AutoOverride<T>(T value) where T : Enum
-    {
-        return ref AutoOverride<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Mark a pair for auto-overriding.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref Entity AutoOverride<TFirst>(ulong second)
-    {
-        return ref AutoOverride(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Mark a pair for auto-overriding.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AutoOverride<TFirst, TSecond>()
-    {
-        return ref AutoOverride(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Mark a pair for auto-overriding.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AutoOverride<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref AutoOverride<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Mark a pair for auto-overriding.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AutoOverride<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref AutoOverrideSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Mark a pair for auto-overriding.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity AutoOverrideSecond<TSecond>(ulong first)
-    {
-        return ref AutoOverride(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Set component, mark component for auto-overriding.
-    /// </summary>
-    /// <param name="component">The component data.</param>
-    /// <typeparam name="T">The component type.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetAutoOverride<T>(in T component)
-    {
-        return ref AutoOverride<T>().Set(in component);
-    }
-
-    /// <summary>
-    ///     Set pair, mark component for auto-overriding.
-    /// </summary>
-    /// <param name="second">The second id of the pair.</param>
-    /// <param name="component">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetAutoOverride<TFirst>(ulong second, in TFirst component)
-    {
-        return ref AutoOverride<TFirst>(second).Set(second, in component);
-    }
-
-    /// <summary>
-    ///     Set pair, mark component for auto-overriding.
-    /// </summary>
-    /// <param name="component">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetAutoOverride<TFirst, TSecond>(in TFirst component)
-    {
-        return ref AutoOverride<TFirst, TSecond>().Set<TFirst, TSecond>(in component);
-    }
-
-    /// <summary>
-    ///     Set pair, mark component for auto-overriding.
-    /// </summary>
-    /// <param name="component">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetAutoOverride<TFirst, TSecond>(in TSecond component)
-    {
-        return ref AutoOverride<TFirst, TSecond>().Set<TFirst, TSecond>(in component);
-    }
-
-    /// <summary>
-    ///     Set pair, mark component for auto-overriding.
-    /// </summary>
-    /// <param name="second">The second id (enum member) of the pair.</param>
-    /// <param name="component">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetAutoOverride<TFirst, TSecond>(TSecond second, in TFirst component) where TSecond : Enum
-    {
-        ulong secondId = Type<TSecond>.Id(World, second);
-        return ref AutoOverride<TFirst>(secondId).Set(secondId, in component);
-    }
-
-    /// <summary>
-    ///     Set pair, mark component for auto-overriding.
-    /// </summary>
-    /// <param name="first">The first id (enum member) of the pair.</param>
-    /// <param name="component">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetAutoOverride<TFirst, TSecond>(TFirst first, in TSecond component) where TFirst : Enum
-    {
-        ulong firstId = Type<TFirst>.Id(World, first);
-        return ref AutoOverrideSecond<TSecond>(firstId).SetSecond(firstId, in component);
-    }
-
-    /// <summary>
-    ///     Set pair, mark component for auto-overriding.
-    /// </summary>
-    /// <param name="first">The first id of the pair.</param>
-    /// <param name="component">The component data.</param>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetAutoOverrideSecond<TSecond>(ulong first, in TSecond component)
-    {
-        return ref AutoOverrideSecond<TSecond>(first).SetSecond(first, in component);
-    }
-
-    /// <summary>
-    ///     Enable this entity.
-    /// </summary>
-    /// <returns></returns>
-    public ref Entity Enable()
-    {
-        ecs_enable(World, Id, true);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Enable an id for entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity Enable(ulong id)
-    {
-        ecs_enable_id(World, Id, id, true);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Enable pair for entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity Enable(ulong first, ulong second)
-    {
-        return ref Enable(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Enable component for entity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Enable<T>()
-    {
-        return ref Enable(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Enable component for entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Enable<T>(T value) where T : Enum
-    {
-        return ref Enable<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Enable pair for entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref Entity Enable<TFirst>(ulong second)
-    {
-        return ref Enable(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Enable pair for entity.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Enable<TFirst, TSecond>()
-    {
-        return ref Enable(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Enable pair for entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Enable<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Enable<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Enable pair for entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Enable<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref EnableSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Enable pair for entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity EnableSecond<TSecond>(ulong first)
-    {
-        return ref Enable(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Disable this entity.
-    /// </summary>
-    /// <returns></returns>
-    public ref Entity Disable()
-    {
-        ecs_enable(World, Id, false);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Disable an id for entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref Entity Disable(ulong id)
-    {
-        ecs_enable_id(World, Id, id, false);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Disable pair for entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref Entity Disable(ulong first, ulong second)
-    {
-        return ref Disable(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Disable component for entity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Disable<T>()
-    {
-        return ref Disable(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Disable component for entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Disable<T>(T value) where T : Enum
-    {
-        return ref Disable<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Disable pair for entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref Entity Disable<TFirst>(ulong second)
-    {
-        return ref Disable(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Disable pair for entity.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Disable<TFirst, TSecond>()
-    {
-        return ref Disable(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Disable pair for entity.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Disable<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Disable<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Disable pair for entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity Disable<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref DisableSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Disable pair for entity.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity DisableSecond<TSecond>(ulong first)
-    {
-        return ref Disable(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Sets the data of a component.
-    /// </summary>
-    /// <param name="id">The id of the component to set.</param>
-    /// <param name="size">The size of the pointed-to data.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetUntyped(ulong id, int size, void* data)
-    {
-        Ecs.Assert(ecs_get_typeid(World, id) != 0, "Cannot set component data for tag ids.");
-        ecs_set_id(World, Id, id, size, data);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a component.
-    /// </summary>
-    /// <param name="id">The id of the component to set.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetUntyped(ulong id, void* data)
-    {
-        EcsComponent* component = (EcsComponent*)ecs_get_id(World, id, FLECS_IDEcsComponentID_);
-        Ecs.Assert(component != null, nameof(ECS_INVALID_PARAMETER));
-        return ref SetUntyped(id, component->size, data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="first">The first id of the pair.</param>
-    /// <param name="second">The second id of the pair.</param>
-    /// <param name="size">The size of the pointed-to data.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetUntyped(ulong first, ulong second, int size, void* data)
-    {
-        return ref SetUntyped(Ecs.Pair(first, second), size, data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a component.
-    /// </summary>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="T">The component type.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetPtr<T>(T* data)
-    {
-        return ref SetInternal(Type<T>.Id(World), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="second">The second id of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetPtr<TFirst>(ulong second, TFirst* data)
-    {
-        return ref SetInternal(Ecs.Pair<TFirst>(second, World), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of a pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of a pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetPtr<TFirst, TSecond>(TSecond* data)
-    {
-        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetPtr<TFirst, TSecond>(TFirst* data)
-    {
-        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="second">The second id (enum member) of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetPtr<TFirst, TSecond>(TSecond second, TFirst* data) where TSecond : Enum
-    {
-        return ref SetPtr(Type<TSecond>.Id(World, second), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="first">The first id (enum member) of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetPtr<TFirst, TSecond>(TFirst first, TSecond* data) where TFirst : Enum
-    {
-        return ref SetPtrSecond(Type<TFirst>.Id(World, first), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="first">The first id of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetPtrSecond<TSecond>(ulong first, TSecond* data)
-    {
-        return ref SetInternal(Ecs.PairSecond<TSecond>(first, World), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a component.
-    /// </summary>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="T">The component type.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Set<T>(in T data)
-    {
-        return ref SetInternal(Type<T>.Id(World), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="second">The second id of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Set<TFirst>(ulong second, in TFirst data)
-    {
-        return ref SetInternal(Ecs.Pair<TFirst>(second, World), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Set<TFirst, TSecond>(in TSecond data)
-    {
-        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Set<TFirst, TSecond>(in TFirst data)
-    {
-        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="second">The second id (enum member) of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Set<TFirst, TSecond>(TSecond second, in TFirst data) where TSecond : Enum
-    {
-        return ref Set(Type<TSecond>.Id(World, second), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="first">The first id (enum member) of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Set<TFirst, TSecond>(TFirst first, in TSecond data) where TFirst : Enum
-    {
-        return ref SetSecond(Type<TFirst>.Id(World, first), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="first">The first id of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity SetSecond<TSecond>(ulong first, in TSecond data)
-    {
-        return ref SetInternal(Ecs.PairSecond<TSecond>(first, World), in data);
-    }
-
-    /// <summary>
-    ///     Entities created in function will have the current entity.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity With(Action callback)
-    {
-        ulong prev = ecs_set_with(World, Id);
-        callback();
-        ecs_set_with(World, prev);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Entities created in function will have (first, this).
-    /// </summary>
-    /// <param name="first">The id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity With(ulong first, Action callback)
-    {
-        ulong prev = ecs_set_with(World, Ecs.Pair(first, Id));
-        callback();
-        ecs_set_with(World, prev);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Entities created in function will have (TFirst, this).
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The component id.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity With<TFirst>(Action callback)
-    {
-        return ref With(Type<TFirst>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     Entities created in function will have the current entity.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity With(Ecs.WorldCallback callback)
-    {
-        ulong prev = ecs_set_with(World, Id);
-        callback(World);
-        ecs_set_with(World, prev);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Entities created in function will have (first, this).
-    /// </summary>
-    /// <param name="first">The id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity With(ulong first, Ecs.WorldCallback callback)
-    {
-        ulong prev = ecs_set_with(World, Ecs.Pair(first, Id));
-        callback(World);
-        ecs_set_with(World, prev);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Entities created in function will have (TFirst, this).
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The component id.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref Entity With<TFirst>(Ecs.WorldCallback callback)
-    {
-        return ref With(Type<TFirst>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     The function will be run with the scope set to the current entity.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Scope(Action callback)
-    {
-        ulong prev = ecs_set_scope(World, Id);
-        callback();
-        ecs_set_scope(World, prev);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     The function will be run with the scope set to the current entity.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <returns>Reference to self.</returns>
-    public ref Entity Scope(Ecs.WorldCallback callback)
-    {
-        ulong prev = ecs_set_scope(World, Id);
-        callback(World);
-        ecs_set_scope(World, prev);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set the entity name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref Entity SetName(string name)
-    {
-        using NativeString nativeName = (NativeString)name;
-        ecs_set_name(World, Id, nativeName);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set entity alias.
-    /// </summary>
-    /// <param name="alias"></param>
-    /// <returns></returns>
-    public ref Entity SetAlias(string alias)
-    {
-        using NativeString nativeAlias = (NativeString)alias;
-        ecs_set_alias(World, Id, nativeAlias);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set doc name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref Entity SetDocName(string name)
-    {
-        using NativeString nativeName = (NativeString)name;
-        ecs_doc_set_name(World, Id, nativeName);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set doc brief.
-    /// </summary>
-    /// <param name="brief"></param>
-    /// <returns></returns>
-    public ref Entity SetDocBrief(string brief)
-    {
-        using NativeString nativeBrief = (NativeString)brief;
-        ecs_doc_set_brief(World, Id, nativeBrief);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set doc detailed description.
-    /// </summary>
-    /// <param name="detail"></param>
-    /// <returns></returns>
-    public ref Entity SetDocDetail(string detail)
-    {
-        using NativeString nativeDetail = (NativeString)detail;
-        ecs_doc_set_detail(World, Id, nativeDetail);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set doc link.
-    /// </summary>
-    /// <param name="link"></param>
-    /// <returns></returns>
-    public ref Entity SetDocLink(string link)
-    {
-        using NativeString nativeLink = (NativeString)link;
-        ecs_doc_set_link(World, Id, nativeLink);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set doc color.
-    /// </summary>
-    /// <param name="color"></param>
-    /// <returns></returns>
-    public ref Entity SetDocColor(string color)
-    {
-        using NativeString nativeColor = (NativeString)color;
-        ecs_doc_set_color(World, Id, nativeColor);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set doc uuid.
-    /// </summary>
-    /// <param name="uuid">The uuid string.</param>
-    /// <returns></returns>
-    public ref Entity SetDocUuid(string uuid)
-    {
-        using NativeString nativeUuid = (NativeString)uuid;
-        ecs_doc_set_uuid(World, Id, nativeUuid);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Make entity a unit.
-    /// </summary>
-    /// <param name="symbol"></param>
-    /// <param name="prefix"></param>
-    /// <param name="base"></param>
-    /// <param name="over"></param>
-    /// <param name="factor"></param>
-    /// <param name="power"></param>
-    /// <returns></returns>
-    public ref Entity Unit(
-        string symbol,
-        ulong prefix = 0,
-        ulong @base = 0,
-        ulong over = 0,
-        int factor = 0,
-        int power = 0)
-    {
-        using NativeString nativeSymbol = (NativeString)symbol;
-
-        ecs_unit_desc_t desc = default;
-        desc.symbol = nativeSymbol;
-        desc.entity = Id;
-        desc.@base = @base;
-        desc.over = over;
-        desc.prefix = prefix;
-        desc.translation.factor = factor;
-        desc.translation.power = power;
-        ecs_unit_init(World, &desc);
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Make entity a derived unit.
-    /// </summary>
-    /// <param name="prefix"></param>
-    /// <param name="base"></param>
-    /// <param name="over"></param>
-    /// <param name="factor"></param>
-    /// <param name="power"></param>
-    /// <returns></returns>
-    public ref Entity Unit(
-        ulong prefix = 0,
-        ulong @base = 0,
-        ulong over = 0,
-        int factor = 0,
-        int power = 0)
-    {
-        ecs_unit_desc_t desc = default;
-        desc.entity = Id;
-        desc.@base = @base;
-        desc.over = over;
-        desc.prefix = prefix;
-        desc.translation.factor = factor;
-        desc.translation.power = power;
-        ecs_unit_init(World, &desc);
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Make unit a prefix.
-    /// </summary>
-    /// <param name="symbol"></param>
-    /// <param name="factor"></param>
-    /// <param name="power"></param>
-    /// <returns></returns>
-    public ref Entity UnitPrefix(string symbol, int factor = 0, int power = 0)
-    {
-        using NativeString nativeSymbol = (NativeString)symbol;
-
-        ecs_unit_prefix_desc_t desc = default;
-        desc.entity = Id;
-        desc.symbol = nativeSymbol;
-        desc.translation.factor = factor;
-        desc.translation.power = power;
-        ecs_unit_prefix_init(World, &desc);
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Add quantity to unit.
-    /// </summary>
-    /// <param name="quantity"></param>
-    /// <returns></returns>
-    public ref Entity Quantity(ulong quantity)
-    {
-        ecs_add_id(World, Id, Ecs.Pair(EcsQuantity, quantity));
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Make entity a quantity.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Quantity<T>()
-    {
-        return ref Quantity(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Make entity a quantity.
-    /// </summary>
-    /// <returns></returns>
-    public ref Entity Quantity()
-    {
-        ecs_add_id(World, Id, EcsQuantity);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set component from JSON.
-    /// </summary>
-    /// <param name="e"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <returns></returns>
-    public ref Entity SetJson(ulong e, string json, ecs_from_json_desc_t* desc = null)
-    {
-        ulong type = ecs_get_typeid(World, e);
-
-        if (type == 0)
-        {
-            Ecs.Error("Id is not a type");
-            return ref this;
-        }
-
-        void* ptr = ecs_ensure_id(World, Id, e);
-        Ecs.Assert(ptr != null, nameof(ECS_INTERNAL_ERROR));
-
-        using NativeString nativeJson = (NativeString)json;
-
-        ecs_ptr_from_json(World, type, ptr, nativeJson, desc);
-        ecs_modified_id(World, Id, e);
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set pair from JSON.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <returns></returns>
-    public ref Entity SetJson(ulong first, ulong second, string json, ecs_from_json_desc_t* desc = null)
-    {
-        return ref SetJson(Ecs.Pair(first, second), json, desc);
-    }
-
-    /// <summary>
-    ///     Set component from JSON.
-    /// </summary>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity SetJson<T>(string json, ecs_from_json_desc_t* desc = null)
-    {
-        return ref SetJson(Type<T>.Id(World), json, desc);
-    }
-
-    /// <summary>
-    ///     Set pair from JSON.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref Entity SetJson<TFirst>(ulong second, string json, ecs_from_json_desc_t* desc = null)
-    {
-        return ref SetJson(Ecs.Pair<TFirst>(second, World), json, desc);
-    }
-
-    /// <summary>
-    ///     Set pair from JSON.
-    /// </summary>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity SetJson<TFirst, TSecond>(string json, ecs_from_json_desc_t* desc = null)
-    {
-        return ref SetJson(Ecs.Pair<TFirst, TSecond>(World), json, desc);
-    }
-
-    /// <summary>
-    ///     Set pair from JSON.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity SetJson<TFirst, TSecond>(TSecond second, string json, ecs_from_json_desc_t* desc = null)
-        where TSecond : Enum
-    {
-        return ref SetJson<TFirst>(Type<TSecond>.Id(World, second), json, desc);
-    }
-
-    /// <summary>
-    ///     Set pair from JSON.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity SetJson<TFirst, TSecond>(TFirst first, string json, ecs_from_json_desc_t* desc = null)
-        where TFirst : Enum
-    {
-        return ref SetJsonSecond<TSecond>(Type<TFirst>.Id(World, first), json, desc);
-    }
-
-    /// <summary>
-    ///     Set pair from JSON.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref Entity SetJsonSecond<TSecond>(ulong first, string json, ecs_from_json_desc_t* desc = null)
-    {
-        return ref SetJson(first, Type<TSecond>.Id(World), json, desc);
-    }
-
-    /// <summary>
-    ///     Observe an event on this entity.
-    /// </summary>
-    /// <param name="eventId"></param>
-    /// <param name="callback"></param>
-    /// <returns></returns>
-    public ref Entity Observe(ulong eventId, Action callback)
-    {
-        return ref ObserveInternal(eventId, callback, (delegate*<ecs_iter_t*, void>)&Functions.ActionCallbackDelegate);
-    }
-
-    /// <summary>
-    ///     Observe an event on this entity.
-    /// </summary>
-    /// <param name="eventId"></param>
-    /// <param name="callback"></param>
-    /// <returns></returns>
-    public ref Entity Observe(ulong eventId, Ecs.ObserveEntityCallback callback)
-    {
-        return ref ObserveInternal(eventId, callback, (delegate*<ecs_iter_t*, void>)&Functions.ObserveEntityCallbackDelegate);
-    }
-
-    /// <summary>
-    ///     Observe an event on this entity.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Observe<T>(Action callback)
-    {
-        return ref Observe(Type<T>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     Observe an event on this entity.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Observe<T>(Ecs.ObserveEntityCallback callback)
-    {
-        return ref Observe(Type<T>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     Observe an event on this entity.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Observe<T>(Ecs.ObserveRefCallback<T> callback)
-    {
-        return ref ObserveInternal(Type<T>.Id(World), callback, (delegate*<ecs_iter_t*, void>)&Functions.ObserveRefCallbackDelegate<T>);
-    }
-
-    /// <summary>
-    ///     Observe an event on this entity.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref Entity Observe<T>(Ecs.ObserveEntityRefCallback<T> callback)
-    {
-        return ref ObserveInternal(Type<T>.Id(World), callback, (delegate*<ecs_iter_t*, void>)&Functions.ObserveEntityRefCallbackDelegate<T>);
-    }
-
-    /// <summary>
-    ///     Get mutable component value (untyped).
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public void* EnsurePtr(ulong id)
-    {
-        return ecs_ensure_id(World, Id, id);
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair (untyped).
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public void* EnsurePtr(ulong first, ulong second)
-    {
-        return EnsurePtr(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Get mutable component value.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* EnsurePtr<T>() where T : unmanaged
-    {
-        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (T*)ecs_ensure_id(World, Id, Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for the first element of a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public TFirst* EnsurePtr<TFirst>(ulong second) where TFirst : unmanaged
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TFirst*)EnsurePtr(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* EnsurePtr<TFirst, TSecond>(TSecond second)
-        where TFirst : unmanaged
-        where TSecond : Enum
-    {
-        return EnsurePtr<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* EnsurePtr<TFirst, TSecond>(TFirst first)
-        where TFirst : Enum
-        where TSecond : unmanaged
-    {
-        return EnsureSecondPtr<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* EnsureFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TFirst*)EnsurePtr(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* EnsureSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TSecond*)EnsurePtr(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer for a pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* EnsureSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return (TSecond*)EnsurePtr(Ecs.PairSecond<TSecond>(first, World));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref T Ensure<T>()
-    {
-        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<T>(ecs_ensure_id(World, Id, Type<T>.Id(World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for the first element of a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref TFirst Ensure<TFirst>(ulong second)
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TFirst>(EnsurePtr(Ecs.Pair<TFirst>(second, World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst Ensure<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Ensure<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond Ensure<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref EnsureSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst EnsureFirst<TFirst, TSecond>()
-    {
-        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TFirst>(EnsurePtr(Ecs.Pair<TFirst, TSecond>(World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond EnsureSecond<TFirst, TSecond>()
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TSecond>(EnsurePtr(Ecs.Pair<TFirst, TSecond>(World)));
-    }
-
-    /// <summary>
-    ///     Get mutable managed reference for pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond EnsureSecond<TSecond>(ulong first)
-    {
-        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
-        return ref Managed.GetTypeRef<TSecond>(EnsurePtr(Ecs.PairSecond<TSecond>(first, World)));
-    }
-
-    /// <summary>
-    ///     Signal that component was modified.
-    /// </summary>
-    /// <param name="id"></param>
-    public void Modified(ulong id)
-    {
-        ecs_modified_id(World, Id, id);
-    }
-
-    /// <summary>
-    ///     Signal that pair was modified.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    public void Modified(ulong first, ulong second)
-    {
-        Modified(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Signal that component was modified.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Modified<T>()
-    {
-        Modified(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Signal that component was modified.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Modified<T>(T value) where T : Enum
-    {
-        Modified<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Signal that a pair was modified.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Modified<TFirst>(ulong second)
-    {
-        Modified(Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Signal that a pair was modified.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Modified<TFirst, TSecond>()
-    {
-        Modified(Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Signal that a pair was modified.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Modified<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Modified<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Signal that a pair was modified.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Modified<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        ModifiedSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Signal that a pair was modified.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    public void ModifiedSecond<TSecond>(ulong first)
-    {
-        Modified(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Get reference to component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Ref<T> GetRef<T>()
-    {
-        return new Ref<T>(World, Id);
-    }
-
-    /// <summary>
-    ///     Get ref to pair component.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public Ref<TFirst> GetRef<TFirst>(ulong second)
-    {
-        return new Ref<TFirst>(World, Id, Ecs.Pair<TFirst>(second, World));
-    }
-
-    /// <summary>
-    ///     Get ref to pair component.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TFirst> GetRef<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return GetRef<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Get ref to pair component.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TSecond> GetRef<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return GetRefSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Get ref to pair component.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TFirst> GetRefFirst<TFirst, TSecond>()
-    {
-        return new Ref<TFirst>(World, Id, Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get ref to pair component.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TSecond> GetRefSecond<TFirst, TSecond>()
-    {
-        return new Ref<TSecond>(World, Id, Ecs.Pair<TFirst, TSecond>(World));
-    }
-
-    /// <summary>
-    ///     Get ref to pair component.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TSecond> GetRefSecond<TSecond>(ulong first)
-    {
-        return new Ref<TSecond>(World, Id, Ecs.PairSecond<TSecond>(first, World));
-    }
-
-    /// <summary>
-    ///     Clear an entity.
-    /// </summary>
-    public void Clear()
-    {
-        ecs_clear(World, Id);
-    }
-
-    /// <summary>
-    ///     Delete an entity.
-    /// </summary>
-    public void Destruct()
-    {
-        ecs_delete(World, Id);
-    }
-
-    /// <summary>
-    ///     Deserialize entity to JSON.
-    /// </summary>
-    /// <param name="json"></param>
-    /// <returns></returns>
-    public string FromJson(string json)
-    {
-        using NativeString nativeJson = (NativeString)json;
-        return NativeString.GetString(ecs_entity_from_json(World, Id, nativeJson, null));
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private ref Entity SetInternal<T>(ulong id, in T component)
-    {
-        fixed (T* ptr = &component)
-            return ref SetInternal(id, ptr);
-    }
-
-    private ref Entity SetInternal<T>(ulong id, T* component)
-    {
-        Ecs.Assert(!Type<T>.IsTag, "Empty structs can't be used as components. Use .Add() to add them as tags instead.");
-
-#if DEBUG
-        if (Ecs.IsPair(id) && !Ecs.TypeIdIs<T>(World, id))
-        {
-            Id pair = new Id(World, id);
-            Entity expected = new Entity(World, ecs_get_typeid(World, id));
-            Entity provided = new Entity(World, Type<T>.Id(World));
-
-            Ecs.Error(expected == 0
-                ? $"Attempted to set component data for tag pair.\n[Pair]: {pair}"
-                : $"Attempted to set component data for incorrect pair type.\n[Pair]: {pair}\n[Expected Type]: {expected}\n[Provided Type]: {provided}");
-
-            return ref this;
-        }
-#endif
-
-        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-        {
-            Managed.AllocGcHandle(component, out GCHandle handle);
-            ecs_set_id(World, Id, id, sizeof(GCHandle), &handle);
-            Managed.FreeGcHandle(handle);
-        }
-        else
-        {
-            ecs_set_id(World, Id, id, sizeof(T), component);
-        }
-
-        return ref this;
-    }
-
-    private ref Entity ObserveInternal<T>(ulong eventId, T callback, void* invoker) where T : Delegate
-    {
-        IteratorContext* iteratorContext = Memory.AllocZeroed<IteratorContext>(1);
-        iteratorContext->Callback.Set(callback, invoker);
-
-        ecs_observer_desc_t desc = default;
-        desc.events[0] = eventId;
-        desc.query.terms[0].id = EcsAny;
-        desc.query.terms[0].src.id = Id;
-        desc.callback = &Functions.IteratorCallback;
-        desc.callback_ctx = iteratorContext;
-        desc.callback_ctx_free = &Functions.IteratorContextFree;
-
-        ulong observer = ecs_observer_init(World, &desc);
-        ecs_add_id(World, observer, Ecs.Pair(EcsChildOf, Id));
-
-        return ref this;
-    }
-
-    private ref Entity ObserveInternal<T>(ulong eventId, void* callback, void* invoker) where T : Delegate
-    {
-        IteratorContext* iteratorContext = Memory.AllocZeroed<IteratorContext>(1);
-        iteratorContext->Callback.Set(callback, invoker);
-
-        ecs_observer_desc_t desc = default;
-        desc.events[0] = eventId;
-        desc.query.terms[0].id = EcsAny;
-        desc.query.terms[0].src.id = Id;
-        desc.callback = &Functions.IteratorCallback;
-        desc.callback_ctx = iteratorContext;
-        desc.callback_ctx_free = &Functions.IteratorContextFree;
-
-        ulong observer = ecs_observer_init(World, &desc);
-        ecs_add_id(World, observer, Ecs.Pair(EcsChildOf, Id));
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Converts an <see cref="Entity"/> instance to its integer id.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public static implicit operator ulong(Entity entity)
-    {
-        return ToUInt64(entity);
-    }
-
-    /// <summary>
-    ///     Converts an <see cref="Entity"/> instance to its id.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public static implicit operator Id(Entity entity)
-    {
-        return ToId(entity);
-    }
-
-    /// <summary>
-    ///     Converts an <see cref="Entity"/> instance to its integer id.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public static ulong ToUInt64(Entity entity)
-    {
-        return entity.Id.Value;
-    }
-
-    /// <summary>
-    ///     Converts an <see cref="Entity"/> instance to its id.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public static Id ToId(Entity entity)
-    {
-        return entity.Id;
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Entity"/> instances are equal.
-    /// </summary>
-    /// <param name="other"></param>
-    /// <returns></returns>
-    public bool Equals(Entity other)
-    {
-        return Id.Value == other.Id.Value;
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Entity"/> instances are equal.
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    public override bool Equals(object? obj)
-    {
-        return obj is Entity entity && Equals(entity);
-    }
-
-    /// <summary>
-    ///     Returns the hash code of the <see cref="Entity"/>.
-    /// </summary>
-    /// <returns></returns>
-    public override int GetHashCode()
-    {
-        return Id.Value.GetHashCode();
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Entity"/> instances are equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator ==(Entity left, Entity right)
-    {
-        return left.Equals(right);
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Entity"/> instances are not equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator !=(Entity left, Entity right)
-    {
-        return !(left == right);
-    }
-
-    /// <summary>
-    ///     Returns the entity's name if it has one, otherwise return its id.
-    /// </summary>
-    /// <returns></returns>
-    public override string ToString()
-    {
-        return Id.ToString();
-    }
-}
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Flecs.NET.Core.BindingContext;
+using Flecs.NET.Utilities;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+/// <summary>
+///     A wrapper for working with entities.
+/// </summary>
+public unsafe partial struct Entity : IEquatable<Entity>, IEntity<Entity>
+{
+    private Id _id;
+
+    /// <summary>
+    ///     Reference to world.
+    /// </summary>
+    public ref ecs_world_t* World => ref _id.World;
+
+    /// <summary>
+    ///     Reference to id.
+    /// </summary>
+    public ref Id Id => ref _id;
+
+    ref Entity IEntity<Entity>.Entity => ref this;
+
+    /// <summary>
+    ///     Returns a null entity.
+    /// </summary>
+    /// <returns></returns>
+    public static Entity Null()
+    {
+        return default;
+    }
+
+    /// <summary>
+    ///     Returns a null entity for the provided world.
+    /// </summary>
+    /// <param name="world"></param>
+    /// <returns></returns>
+    public static Entity Null(ecs_world_t* world)
+    {
+        return new Entity(world, 0);
+    }
+
+    /// <summary>
+    ///     Creates an entity with the provided id.
+    /// </summary>
+    /// <param name="id"></param>
+    public Entity(ulong id)
+    {
+        _id = id;
+    }
+
+    /// <summary>
+    ///     Creates an entity for the provided world.
+    /// </summary>
+    /// <param name="world"></param>
+    public Entity(ecs_world_t* world)
+    {
+        if (ecs_get_scope(world) == 0 && ecs_get_with(world) == 0)
+        {
+            _id = new Id(world, ecs_new(world));
+        }
+        else
+        {
+            ecs_entity_desc_t desc = default;
+            _id = new Id(world, ecs_entity_init(world, &desc));
+        }
+    }
+
+    /// <summary>
+    ///     Creates an entity from the provided world and id.
+    /// </summary>
+    /// <param name="world"></param>
+    /// <param name="id"></param>
+    public Entity(ecs_world_t* world, ulong id)
+    {
+        _id = new Id(world, id);
+    }
+
+    /// <summary>
+    ///     Creates an entity from the provided world and name.
+    /// </summary>
+    /// <param name="world"></param>
+    /// <param name="name"></param>
+    public Entity(ecs_world_t* world, string name)
+    {
+        using NativeString nativeName = (NativeString)name;
+
+        ecs_entity_desc_t desc = default;
+        desc.name = nativeName;
+        desc.sep = Pointers.DefaultSeparator;
+        desc.root_sep = Pointers.DefaultSeparator;
+
+        _id = new Id(world, ecs_entity_init(world, &desc));
+    }
+
+    /// <summary>
+    ///     Check if entity is valid.
+    /// </summary>
+    /// <returns></returns>
+    public bool IsValid()
+    {
+        return World != null && ecs_is_valid(World, Id);
+    }
+
+    /// <summary>
+    ///     Check if entity is alive.
+    /// </summary>
+    /// <returns></returns>
+    public bool IsAlive()
+    {
+        return World != null && ecs_is_alive(World, Id);
+    }
+
+    /// <summary>
+    ///     Return the entity name.
+    /// </summary>
+    /// <returns></returns>
+    public string Name()
+    {
+        return NativeString.GetString(ecs_get_name(World, Id));
+    }
+
+    /// <summary>
+    ///     Return the entity symbol.
+    /// </summary>
+    /// <returns></returns>
+    public string Symbol()
+    {
+        return NativeString.GetString(ecs_get_symbol(World, Id));
+    }
+
+    /// <summary>
+    ///     Return the entity path.
+    /// </summary>
+    /// <param name="sep"></param>
+    /// <param name="initSep"></param>
+    /// <returns></returns>
+    public string Path(string sep = Ecs.DefaultSeparator, string initSep = Ecs.DefaultSeparator)
+    {
+        return PathFrom(0, sep, initSep);
+    }
+
+    /// <summary>
+    ///     Return the entity path relative to a parent.
+    /// </summary>
+    /// <param name="parent"></param>
+    /// <param name="sep"></param>
+    /// <param name="initSep"></param>
+    /// <returns></returns>
+    public string PathFrom(ulong parent, string sep = Ecs.DefaultSeparator, string initSep = Ecs.DefaultSeparator)
+    {
+        using NativeString nativeSep = (NativeString)sep;
+        using NativeString nativeInitSep = (NativeString)initSep;
+
+        return NativeString.GetStringAndFree(ecs_get_path_w_sep(World, parent, Id, nativeSep, nativeInitSep));
+    }
+
+    /// <summary>
+    ///     Return the entity path relative to a parent.
+    /// </summary>
+    /// <param name="sep"></param>
+    /// <param name="initSep"></param>
+    /// <typeparam name="TParent"></typeparam>
+    /// <returns></returns>
+    public string PathFrom<TParent>(string sep = Ecs.DefaultSeparator, string initSep = Ecs.DefaultSeparator)
+    {
+        return PathFrom(Type<TParent>.Id(World), sep, initSep);
+    }
+
+    /// <summary>
+    ///     Check if entity is enabled.
+    /// </summary>
+    /// <returns></returns>
+    public bool Enabled()
+    {
+        return !ecs_has_id(World, Id, EcsDisabled);
+    }
+
+    /// <summary>
+    ///     Checks if id is enabled.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public bool Enabled(ulong id)
+    {
+        return ecs_is_enabled_id(World, Id, id);
+    }
+
+    /// <summary>
+    ///     Checks if pair is enabled.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public bool Enabled(ulong first, ulong second)
+    {
+        return Enabled(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Checks if type is enabled.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Enabled<T>()
+    {
+        return Enabled(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Checks if type is enabled.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Enabled<T>(T value) where T : Enum
+    {
+        return Enabled<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Checks if pair is enabled.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public bool Enabled<TFirst>(ulong second)
+    {
+        return Enabled(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Checks if pair is enabled.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Enabled<TFirst, TSecond>()
+    {
+        return Enabled(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Checks if pair is enabled.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Enabled<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Enabled<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Checks if pair is enabled.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Enabled<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return EnabledSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Checks if pair is enabled.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool EnabledSecond<TSecond>(ulong first)
+    {
+        return Enabled(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Get the entity's type.
+    /// </summary>
+    /// <returns></returns>
+    public FlecsType Type()
+    {
+        return new FlecsType(World, ecs_get_type(World, Id));
+    }
+
+    /// <summary>
+    ///     Get the entity's table.
+    /// </summary>
+    /// <returns></returns>
+    public Table Table()
+    {
+        return new Table(World, ecs_get_table(World, Id));
+    }
+
+    /// <summary>
+    ///     Get table range for the entity.
+    /// </summary>
+    /// <returns></returns>
+    public Table Range()
+    {
+        ecs_record_t* r = ecs_record_find(World, Id);
+        return r != null ? new Table(World, r->table, Ecs.RecordToRow(r->row), 1) : new Table();
+    }
+
+    /// <summary>
+    ///     Iterate (component) ids of an entity.
+    /// </summary>
+    /// <param name="func"></param>
+    public void Each(Ecs.EachIdCallback func)
+    {
+        ecs_type_t* type = ecs_get_type(World, Id);
+
+        if (type == null)
+            return;
+
+        ulong* ids = type->array;
+        int count = type->count;
+
+        for (int i = 0; i < count; i++)
+            func(new Id(World, ids[i]));
+    }
+
+    /// <summary>
+    ///     Iterate matching pair ids of an entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <param name="func"></param>
+    public void Each(ulong first, ulong second, Ecs.EachIdCallback func)
+    {
+        ecs_world_t* realWorld = ecs_get_world(World);
+        ecs_table_t* table = ecs_get_table(World, Id);
+
+        if (table == null)
+            return;
+
+        ecs_type_t* type = ecs_table_get_type(table);
+
+        if (type == null)
+            return;
+
+        ulong pattern = first;
+
+        if (second != 0)
+            pattern = Ecs.Pair(first, second);
+
+        int cur = 0;
+        ulong* ids = type->array;
+
+        while (-1 != (cur = ecs_search_offset(realWorld, table, cur, pattern, null)))
+        {
+            func(new Id(World, ids[cur]));
+            cur++;
+        }
+    }
+
+    /// <summary>
+    ///     Iterate targets for a given relationship.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <param name="func"></param>
+    public void Each(ulong relation, Ecs.EachEntityCallback func)
+    {
+        Each(relation, EcsWildcard, id => { func(id.Second()); });
+    }
+
+    /// <summary>
+    ///     Iterate targets for a given relationship.
+    /// </summary>
+    /// <param name="func"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Each<TFirst>(Ecs.EachEntityCallback func)
+    {
+        Each(Type<TFirst>.Id(World), func);
+    }
+
+    /// <summary>
+    ///     Iterate targets for a given relationship.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Each<TFirst>(TFirst relation, Ecs.EachEntityCallback callback) where TFirst : Enum
+    {
+        Each(Type<TFirst>.Id(World, relation), callback);
+    }
+
+    /// <summary>
+    ///     Iterate children for entity.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <param name="callback"></param>
+    public void Children(ulong relation, Ecs.EachEntityCallback callback)
+    {
+        if (Id == EcsWildcard || Id == EcsAny)
+            return;
+
+        ecs_iter_t it = ecs_each_id(World, Ecs.Pair(relation, Id));
+        while (ecs_each_next(&it))
+            Invoker.Each(&it, callback);
+    }
+
+    /// <summary>
+    ///     Iterate children for entity.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="TRel"></typeparam>
+    public void Children<TRel>(Ecs.EachEntityCallback callback)
+    {
+        Children(Type<TRel>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     Iterate children for entity.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Children<TFirst>(TFirst relation, Ecs.EachEntityCallback callback) where TFirst : Enum
+    {
+        Children(Type<TFirst>.Id(World, relation), callback);
+    }
+
+    /// <summary>
+    ///     Iterate children for entity.
+    /// </summary>
+    /// <param name="callback"></param>
+    public void Children(Ecs.EachEntityCallback callback)
+    {
+        Children(EcsChildOf, callback);
+    }
+
+    /// <summary>
+    ///     Get pointer to component value.
+    /// </summary>
+    /// <param name="compId"></param>
+    /// <returns></returns>
+    public void* GetPtr(ulong compId)
+    {
+        return ecs_get_id(World, Id, compId);
+    }
+
+    /// <summary>
+    ///     Get pointer to component value from pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public void* GetPtr(ulong first, ulong second)
+    {
+        return GetPtr(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Get pointer to component value.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* GetPtr<T>() where T : unmanaged
+    {
+        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (T*)ecs_get_id(World, Id, Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Get pointer to component value from pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetPtr<TFirst>(ulong second) where TFirst : unmanaged
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+
+        if (!typeof(TFirst).IsEnum || (second != Ecs.Wildcard && second != Ecs.Any))
+            return (TFirst*)GetPtr(Ecs.Pair<TFirst>(second, World));
+
+        Entity target = Target<TFirst>();
+        return target == 0 ? null : (TFirst*)target.GetPtr(EcsConstant, Type<TFirst>.UnderlyingTypeId);
+    }
+
+    /// <summary>
+    ///     Get pointer to component value from pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetPtr<TFirst, TSecond>(TSecond second)
+        where TFirst : unmanaged
+        where TSecond : Enum
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TFirst*)GetPtr(Ecs.Pair<TFirst, TSecond>(second, World));
+    }
+
+    /// <summary>
+    ///     Get pointer to component value from pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetPtr<TFirst, TSecond>(TFirst first)
+        where TFirst : Enum
+        where TSecond : unmanaged
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TSecond*)GetPtr(Ecs.Pair<TFirst, TSecond>(first, World));
+    }
+
+    /// <summary>
+    ///     Get pointer to component value from pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TFirst*)GetPtr(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get pointer to component value from pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TSecond*)GetPtr(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get pointer to component value from pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TSecond*)GetPtr(Ecs.PairSecond<TSecond>(first, World));
+    }
+
+    /// <summary>
+    ///     Get managed reference to component value.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref readonly T Get<T>()
+    {
+        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<T>(ecs_get_id(World, Id, Type<T>.Id(World)));
+    }
+
+    /// <summary>
+    ///     Get managed reference to component value from pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref readonly TFirst Get<TFirst>(ulong second)
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+
+        if (!typeof(TFirst).IsEnum || (second != Ecs.Wildcard && second != Ecs.Any))
+            return ref Managed.GetTypeRef<TFirst>(GetPtr(Ecs.Pair<TFirst>(second, World)));
+
+        Entity target = Target<TFirst>();
+        return ref target == 0 ? ref Unsafe.NullRef<TFirst>() : ref Managed.GetTypeRef<TFirst>(target.GetPtr(EcsConstant, Type<TFirst>.UnderlyingTypeId));
+    }
+
+    /// <summary>
+    ///     Get managed reference to component value from pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TFirst Get<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TFirst>(GetPtr(Ecs.Pair<TFirst, TSecond>(second, World)));
+    }
+
+    /// <summary>
+    ///     Get managed reference to component value from pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TSecond Get<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TSecond>(GetPtr(Ecs.Pair<TFirst, TSecond>(first, World)));
+    }
+
+    /// <summary>
+    ///     Get managed reference to component value from pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TFirst GetFirst<TFirst, TSecond>()
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TFirst>(GetPtr(Ecs.Pair<TFirst, TSecond>(World)));
+    }
+
+    /// <summary>
+    ///     Get managed reference to component value from pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TSecond GetSecond<TFirst, TSecond>()
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TSecond>(GetPtr(Ecs.Pair<TFirst, TSecond>(World)));
+    }
+
+    /// <summary>
+    ///     Get managed reference to component value from pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TSecond GetSecond<TSecond>(ulong first)
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TSecond>(GetPtr(Ecs.PairSecond<TSecond>(first, World)));
+    }
+
+    /// <summary>
+    ///     Get mutable component value (untyped).
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public void* GetMutPtr(ulong id)
+    {
+        return ecs_get_mut_id(World, Id, id);
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair (untyped).
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public void* GetMutPtr(ulong first, ulong second)
+    {
+        return GetMutPtr(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Get mutable component value.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* GetMutPtr<T>() where T : unmanaged
+    {
+        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (T*)ecs_get_mut_id(World, Id, Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for the first element of a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetMutPtr<TFirst>(ulong second) where TFirst : unmanaged
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TFirst*)GetMutPtr(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetMutPtr<TFirst, TSecond>(TSecond second)
+        where TFirst : unmanaged
+        where TSecond : Enum
+    {
+        return GetMutPtr<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetMutPtr<TFirst, TSecond>(TFirst first)
+        where TFirst : Enum
+        where TSecond : unmanaged
+    {
+        return GetMutSecondPtr<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetMutFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TFirst*)GetMutPtr(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetMutSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TSecond*)GetMutPtr(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetMutSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TSecond*)GetMutPtr(Ecs.PairSecond<TSecond>(first, World));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref T GetMut<T>()
+    {
+        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<T>(ecs_get_mut_id(World, Id, Type<T>.Id(World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for the first element of a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref TFirst GetMut<TFirst>(ulong second)
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TFirst>(GetMutPtr(Ecs.Pair<TFirst>(second, World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst GetMut<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref GetMut<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond GetMut<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref GetMutSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst GetMutFirst<TFirst, TSecond>()
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TFirst>(GetMutPtr(Ecs.Pair<TFirst, TSecond>(World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond GetMutSecond<TFirst, TSecond>()
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TSecond>(GetMutPtr(Ecs.Pair<TFirst, TSecond>(World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond GetMutSecond<TSecond>(ulong first)
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TSecond>(GetMutPtr(Ecs.PairSecond<TSecond>(first, World)));
+    }
+
+    /// <summary>
+    ///     Get target for a given pair.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public Entity Target(ulong relation, int index = 0)
+    {
+        return new Entity(World, ecs_get_target(World, Id, relation, index));
+    }
+
+    /// <summary>
+    ///     Get target for a given pair.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Target<T>(int index = 0)
+    {
+        return new Entity(World, ecs_get_target(World, Id, Type<T>.Id(World), index));
+    }
+
+    /// <summary>
+    ///     Get the target of a pair for a given relationship id.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public Entity TargetFor(ulong relation, ulong id)
+    {
+        return new Entity(World, ecs_get_target_for_id(World, Id, relation, id));
+    }
+
+    /// <summary>
+    ///     Get the target of a pair for a given relationship id.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity TargetFor<T>(ulong relation)
+    {
+        return new Entity(World, TargetFor(relation, Type<T>.Id(World)));
+    }
+
+    /// <summary>
+    ///     Get the target of a pair for a given relationship id.
+    /// </summary>
+    /// <param name="relation"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Entity TargetFor<TFirst, TSecond>(ulong relation)
+    {
+        ulong pair = Ecs.Pair<TFirst, TSecond>(World);
+        return new Entity(World, TargetFor(relation, pair));
+    }
+
+    /// <summary>
+    ///     Get depth for given relationship.
+    /// </summary>
+    /// <param name="rel"></param>
+    /// <returns></returns>
+    public int Depth(ulong rel)
+    {
+        return ecs_get_depth(World, Id, rel);
+    }
+
+    /// <summary>
+    ///     Get depth for given relationship.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public int Depth<T>()
+    {
+        return Depth(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Get depth for given relationship.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public int Depth<T>(T value) where T : Enum
+    {
+        return Depth(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Get parent of entity.
+    /// </summary>
+    /// <returns></returns>
+    public Entity Parent()
+    {
+        return Target(EcsChildOf);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public Entity Lookup(string path, bool recursive = false)
+    {
+        Ecs.Assert(Id != 0, "Invalid lookup from null handle.");
+        using NativeString nativePath = (NativeString)path;
+        ulong id = ecs_lookup_path_w_sep(World, Id, nativePath,
+            Pointers.DefaultSeparator, Pointers.DefaultSeparator, recursive);
+        return new Entity(World, id);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, out Entity entity)
+    {
+        return TryLookup(path, false, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, bool recursive, out Entity entity)
+    {
+        return (entity = Lookup(path, recursive)) != 0;
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, out ulong entity)
+    {
+        return TryLookup(path, false, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, bool recursive, out ulong entity)
+    {
+        return (entity = Lookup(path, recursive)) != 0;
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public bool Has(ulong id)
+    {
+        return ecs_has_id(World, Id, id);
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public bool Has(ulong first, ulong second)
+    {
+        return Has(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Has<T>()
+    {
+        return ecs_has_id(World, Id, Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided enum constant.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Has<T>(T value) where T : Enum
+    {
+        return Has<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst>(ulong second)
+    {
+        return Has(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst, TSecond>()
+    {
+        return Has(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Has<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return HasSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Check if entity has the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool HasSecond<TSecond>(ulong first)
+    {
+        return Has(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public bool Owns(ulong id)
+    {
+        return ecs_owns_id(World, Id, id);
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public bool Owns(ulong first, ulong second)
+    {
+        return Owns(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Owns<T>()
+    {
+        return Owns(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided component.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Owns<T>(T value) where T : Enum
+    {
+        return Owns<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public bool Owns<TFirst>(ulong second)
+    {
+        return Owns(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Owns<TFirst, TSecond>()
+    {
+        return Owns(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Owns<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Owns<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Owns<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return OwnsSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Check if entity owns the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool OwnsSecond<TSecond>(ulong first)
+    {
+        return Owns(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Clones the entity.
+    /// </summary>
+    /// <param name="cloneValue"></param>
+    /// <param name="dstId"></param>
+    /// <returns></returns>
+    public Entity Clone(bool cloneValue = true, ulong dstId = 0)
+    {
+        if (dstId == 0)
+            dstId = ecs_new(World);
+
+        Entity dst = new Entity(World, dstId);
+        ecs_clone(World, dstId, Id, cloneValue);
+        return dst;
+    }
+
+    /// <summary>
+    ///     Return mutable entity handle for current stage.
+    /// </summary>
+    /// <param name="stage"></param>
+    /// <returns></returns>
+    public Entity Mut(ref World stage)
+    {
+        Ecs.Assert(!stage.IsReadOnly(), "Cannot use readonly world/stage to create mutable handle");
+        return new Entity(Id).SetStage(stage);
+    }
+
+    /// <summary>
+    ///     Return mutable entity handle for current iter.
+    /// </summary>
+    /// <param name="it"></param>
+    /// <returns></returns>
+    public Entity Mut(ref Iter it)
+    {
+        Ecs.Assert(!it.World().IsReadOnly(),
+            "Cannot use iterator created for readonly world/stage to create mutable handle");
+        return new Entity(Id).SetStage(it.World());
+    }
+
+    /// <summary>
+    ///     Return mutable entity handle for current entity.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public Entity Mut(ref Entity entity)
+    {
+        Ecs.Assert(!entity.CsWorld().IsReadOnly(),
+            "Cannot use entity created for readonly world/stage to create mutable handle");
+        return new Entity(Id).SetStage(entity.World);
+    }
+
+    /// <summary>
+    ///     Return mutable entity handle for current stage.
+    /// </summary>
+    /// <param name="stage"></param>
+    /// <returns></returns>
+    public Entity Mut(World stage)
+    {
+        return Mut(ref stage);
+    }
+
+    /// <summary>
+    ///     Return mutable entity handle for current iter.
+    /// </summary>
+    /// <param name="it"></param>
+    /// <returns></returns>
+    public Entity Mut(Iter it)
+    {
+        return Mut(ref it);
+    }
+
+    /// <summary>
+    ///     Return mutable entity handle for current entity.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public Entity Mut(Entity entity)
+    {
+        return Mut(ref entity);
+    }
+
+    private Entity SetStage(ecs_world_t* stage)
+    {
+        return new Entity(stage, Id);
+    }
+
+    /// <summary>
+    ///     Serializes the entity to a JSON string using the provided description.
+    /// </summary>
+    /// <param name="desc">The description settings for JSON serialization.</param>
+    /// <returns>A JSON string with the serialized entity data, or an empty string if failed.</returns>
+    public string ToJson(in EntityToJsonDesc desc)
+    {
+        fixed (ecs_entity_to_json_desc_t* ptr = &desc.Desc)
+        {
+            return NativeString.GetStringAndFree(ecs_entity_to_json(World, Id, ptr));
+        }
+    }
+
+    /// <summary>
+    ///     Serializes the entity to a JSON string.
+    /// </summary>
+    /// <returns>A JSON string with the serialized entity data, or an empty string if failed.</returns>
+    public string ToJson()
+    {
+        return NativeString.GetStringAndFree(ecs_entity_to_json(World, Id, null));
+    }
+
+    /// <summary>
+    ///     Returns the entity's doc name.
+    /// </summary>
+    /// <returns></returns>
+    public string DocName()
+    {
+        return NativeString.GetString(ecs_doc_get_name(World, Id));
+    }
+
+    /// <summary>
+    ///     Returns the entity's doc brief.
+    /// </summary>
+    /// <returns></returns>
+    public string DocBrief()
+    {
+        return NativeString.GetString(ecs_doc_get_brief(World, Id));
+    }
+
+    /// <summary>
+    ///     Returns the entity's doc detail.
+    /// </summary>
+    /// <returns></returns>
+    public string DocDetail()
+    {
+        return NativeString.GetString(ecs_doc_get_detail(World, Id));
+    }
+
+    /// <summary>
+    ///     Returns the entity's doc detail.
+    /// </summary>
+    /// <returns></returns>
+    public string DocLink()
+    {
+        return NativeString.GetString(ecs_doc_get_link(World, Id));
+    }
+
+    /// <summary>
+    ///     Returns the entity's doc color.
+    /// </summary>
+    /// <returns></returns>
+    public string DocColor()
+    {
+        return NativeString.GetString(ecs_doc_get_color(World, Id));
+    }
+
+    /// <summary>
+    ///     Returns the entity's doc uuid.
+    /// </summary>
+    /// <returns></returns>
+    public string DocUuid()
+    {
+        return NativeString.GetString(ecs_doc_get_uuid(World, Id));
+    }
+
+    /// <summary>
+    ///     Return number of alerts for entity.
+    /// </summary>
+    /// <param name="alert"></param>
+    /// <returns></returns>
+    public int AlertCount(ulong alert = 0)
+    {
+        return ecs_get_alert_count(World, Id, alert);
+    }
+
+    /// <summary>
+    ///     Convert entity to enum constant.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T ToConstant<T>() where T : unmanaged, Enum
+    {
+        T* ptr = (T*)GetPtr(Ecs.Constant, Type<T>.UnderlyingTypeId);
+        Ecs.Assert(ptr != null, "Entity is not a constant");
+        return *ptr;
+    }
+
+    /// <summary>
+    ///     Emits an event for this entity.
+    /// </summary>
+    /// <param name="eventId"></param>
+    public void Emit(ulong eventId)
+    {
+        new World(World)
+            .Event(eventId)
+            .Entity(Id)
+            .Emit();
+    }
+
+    /// <summary>
+    ///     Emits an event for this entity.
+    /// </summary>
+    /// <param name="eventId"></param>
+    public void Emit(Entity eventId)
+    {
+        Emit(eventId.Id.Value);
+    }
+
+    /// <summary>
+    ///     Emits an event for this entity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Emit<T>()
+    {
+        Emit(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Emits an event for this entity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Emit<T>(T payload) where T : unmanaged
+    {
+        new World(World)
+            .Event(Type<T>.Id(World))
+            .Entity(Id)
+            .Ctx(&payload)
+            .Emit();
+    }
+
+    /// <summary>
+    ///     Emits an event for this entity.
+    /// </summary>
+    /// <param name="payload"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Emit<T>(ref T payload)
+    {
+        fixed (T* ptr = &payload)
+        {
+            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+            {
+                Managed.AllocGcHandle(ptr, out GCHandle handle);
+
+                new World(World)
+                    .Event(Type<T>.Id(World))
+                    .Entity(Id)
+                    .Ctx(&handle)
+                    .Emit();
+
+                Managed.FreeGcHandle(handle);
+            }
+            else
+            {
+                new World(World)
+                    .Event(Type<T>.Id(World))
+                    .Entity(Id)
+                    .Ctx(ptr)
+                    .Emit();
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Enqueues an event for this entity.
+    /// </summary>
+    /// <param name="eventId"></param>
+    public void Enqueue(ulong eventId)
+    {
+        new World(World)
+            .Event(eventId)
+            .Entity(Id)
+            .Enqueue();
+    }
+
+    /// <summary>
+    ///     Enqueues an event for this entity.
+    /// </summary>
+    /// <param name="eventId"></param>
+    public void Enqueue(Entity eventId)
+    {
+        Enqueue(eventId.Id.Value);
+    }
+
+    /// <summary>
+    ///     Enqueues an event for this entity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Enqueue<T>()
+    {
+        Enqueue(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Enqueues an event for this entity.
+    /// </summary>
+    /// <param name="payload"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Enqueue<T>(T payload) where T : unmanaged
+    {
+        new World(World)
+            .Event(Type<T>.Id(World))
+            .Entity(Id)
+            .Ctx(&payload)
+            .Enqueue();
+    }
+
+    /// <summary>
+    ///     Enqueues an event for this entity.
+    /// </summary>
+    /// <param name="payload"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Enqueue<T>(ref T payload)
+    {
+        fixed (T* ptr = &payload)
+        {
+            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+            {
+                Managed.AllocGcHandle(ptr, out GCHandle handle);
+
+                new World(World)
+                    .Event(Type<T>.Id(World))
+                    .Entity(Id)
+                    .Ctx(&handle)
+                    .Enqueue();
+
+                Managed.FreeGcHandle(handle);
+            }
+            else
+            {
+                new World(World)
+                    .Event(Type<T>.Id(World))
+                    .Entity(Id)
+                    .Ctx(ptr)
+                    .Enqueue();
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Short for Has(EcsChildOf, entity).
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public bool IsChildOf(ulong entity)
+    {
+        Ecs.Assert(!Ecs.IsPair(entity), "Cannot use pairs as an argument.");
+        return Has(EcsChildOf, entity);
+    }
+
+    /// <summary>
+    ///     Short for Has(EcsChildOf, entity).
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool IsChildOf<T>()
+    {
+        return IsChildOf(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Short for Has(EcsChildOf, entity).
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool IsChildOf<T>(T value) where T : Enum
+    {
+        return IsChildOf(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Add an entity to entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity Add(ulong id)
+    {
+        Ecs.Assert(ecs_id_is_valid(World, id), nameof(ECS_INVALID_OPERATION));
+        ecs_add_id(World, Id, id);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Add pair to entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity Add(ulong first, ulong second)
+    {
+        return ref Add(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Add a component to entity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Add<T>()
+    {
+        return ref Add(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Add a pair to entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref Entity Add<TFirst>(ulong second)
+    {
+        return ref Add(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Add an enum to entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Add<T>(T value) where T : Enum
+    {
+        return ref Add<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Add a pair to entity.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Add<TFirst, TSecond>()
+    {
+        return ref Add<TFirst>(Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Add a pair to entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Add<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Add<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Add a pair to entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Add<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref AddSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Add a pair to entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddSecond<TSecond>(ulong first)
+    {
+        return ref Add(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Conditionally adds an entity to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity AddIf(bool cond, ulong id)
+    {
+        return ref cond ? ref Add(id) : ref Remove(id);
+    }
+
+    /// <summary>
+    ///     Conditionally adds a pair to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity AddIf(bool cond, ulong first, ulong second)
+    {
+        if (cond)
+            return ref Add(first, second);
+
+        if (second == 0 || ecs_has_id(World, first, EcsExclusive))
+            second = EcsWildcard;
+
+        return ref Remove(first, second);
+    }
+
+    /// <summary>
+    ///     Conditionally adds a component to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddIf<T>(bool cond)
+    {
+        return ref cond ? ref Add<T>() : ref Remove<T>();
+    }
+
+    /// <summary>
+    ///     Conditionally adds an enum to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddIf<T>(bool cond, T value) where T : Enum
+    {
+        return ref AddIf<T>(cond, Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Conditionally adds a pair to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddIf<TFirst>(bool cond, ulong second)
+    {
+        return ref AddIf(cond, Type<TFirst>.Id(World), second);
+    }
+
+    /// <summary>
+    ///     Conditionally adds a pair to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddIf<TFirst, TSecond>(bool cond)
+    {
+        return ref AddIf<TFirst>(cond, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Conditionally adds a pair to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddIf<TFirst, TSecond>(bool cond, TSecond second) where TSecond : Enum
+    {
+        return ref AddIf<TFirst>(cond, Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Conditionally adds a pair to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddIf<TFirst, TSecond>(bool cond, TFirst first) where TFirst : Enum
+    {
+        return ref AddIfSecond<TSecond>(cond, Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Conditionally adds a pair to entity.
+    /// </summary>
+    /// <param name="cond"></param>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AddIfSecond<TSecond>(bool cond, ulong first)
+    {
+        return ref AddIf(cond, first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsIsA, entity).
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity IsA(ulong id)
+    {
+        return ref Add(EcsIsA, id);
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsIsA, entity).
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity IsA<T>()
+    {
+        return ref Add(EcsIsA, Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsIsA, entity).
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity IsA<T>(T value) where T : Enum
+    {
+        return ref IsA(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsChildOf, entity).
+    /// </summary>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity ChildOf(ulong second)
+    {
+        return ref Add(EcsChildOf, second);
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsChildOf, entity).
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity ChildOf<T>()
+    {
+        return ref Add(EcsChildOf, Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsChildOf, entity).
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity ChildOf<T>(T value) where T : Enum
+    {
+        return ref ChildOf(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcDependsOn, entity).
+    /// </summary>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity DependsOn(ulong second)
+    {
+        return ref Add(EcsDependsOn, second);
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcDependsOn, entity).
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity DependsOn<T>()
+    {
+        return ref DependsOn(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcDependsOn, entity).
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity DependsOn<T>(T value) where T : Enum
+    {
+        return ref DependsOn(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsSlotOf, entity).
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity SlotOf(ulong id)
+    {
+        return ref Add(EcsSlotOf, id);
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsSlotOf, entity).
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity SlotOf<T>()
+    {
+        return ref Add(EcsSlotOf, Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsSlotOf, entity).
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity SlotOf<T>(T value) where T : Enum
+    {
+        return ref SlotOf(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Shortcut for Add(EcsSlotOf, Target(EcsChildOf)).
+    /// </summary>
+    /// <returns></returns>
+    public ref Entity Slot()
+    {
+        Ecs.Assert(ecs_get_target(World, Id, EcsChildOf, 0) != 0, "Add ChildOf pair before using slot()");
+        return ref SlotOf(Target(EcsChildOf));
+    }
+
+    /// <summary>
+    ///     Remove an entity from entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity Remove(ulong id)
+    {
+        ecs_remove_id(World, Id, id);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Remove a pair from entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity Remove(ulong first, ulong second)
+    {
+        return ref Remove(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Remove a component from entity. If the provided type argument is an enum,
+    ///     this operation will remove any (Enum, *) pair from the entity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Remove<T>()
+    {
+        return ref Remove(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Remove an enum from entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Remove<T>(T value) where T : Enum
+    {
+        return ref Remove<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Remove a pair from entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref Entity Remove<TFirst>(ulong second)
+    {
+        return ref Remove(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Remove a pair from entity.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Remove<TFirst, TSecond>()
+    {
+        return ref Remove(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Remove a pair from entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Remove<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Remove<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Remove a pair from entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Remove<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref RemoveSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Remove a pair from entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity RemoveSecond<TSecond>(ulong first)
+    {
+        return ref Remove(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Mark id for auto-overriding.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity AutoOverride(ulong id)
+    {
+        ecs_add_id(World, Id, ECS_AUTO_OVERRIDE | id);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Mark a pair for auto-overriding.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity AutoOverride(ulong first, ulong second)
+    {
+        return ref AutoOverride(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Mark a component or auto-overriding.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity AutoOverride<T>()
+    {
+        return ref AutoOverride(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Mark a component or auto-overriding.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity AutoOverride<T>(T value) where T : Enum
+    {
+        return ref AutoOverride<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Mark a pair for auto-overriding.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref Entity AutoOverride<TFirst>(ulong second)
+    {
+        return ref AutoOverride(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Mark a pair for auto-overriding.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AutoOverride<TFirst, TSecond>()
+    {
+        return ref AutoOverride(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Mark a pair for auto-overriding.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AutoOverride<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref AutoOverride<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Mark a pair for auto-overriding.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AutoOverride<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref AutoOverrideSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Mark a pair for auto-overriding.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity AutoOverrideSecond<TSecond>(ulong first)
+    {
+        return ref AutoOverride(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Set component, mark component for auto-overriding.
+    /// </summary>
+    /// <param name="component">The component data.</param>
+    /// <typeparam name="T">The component type.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetAutoOverride<T>(in T component)
+    {
+        return ref AutoOverride<T>().Set(in component);
+    }
+
+    /// <summary>
+    ///     Set pair, mark component for auto-overriding.
+    /// </summary>
+    /// <param name="second">The second id of the pair.</param>
+    /// <param name="component">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetAutoOverride<TFirst>(ulong second, in TFirst component)
+    {
+        return ref AutoOverride<TFirst>(second).Set(second, in component);
+    }
+
+    /// <summary>
+    ///     Set pair, mark component for auto-overriding.
+    /// </summary>
+    /// <param name="component">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetAutoOverride<TFirst, TSecond>(in TFirst component)
+    {
+        return ref AutoOverride<TFirst, TSecond>().Set<TFirst, TSecond>(in component);
+    }
+
+    /// <summary>
+    ///     Set pair, mark component for auto-overriding.
+    /// </summary>
+    /// <param name="component">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetAutoOverride<TFirst, TSecond>(in TSecond component)
+    {
+        return ref AutoOverride<TFirst, TSecond>().Set<TFirst, TSecond>(in component);
+    }
+
+    /// <summary>
+    ///     Set pair, mark component for auto-overriding.
+    /// </summary>
+    /// <param name="second">The second id (enum member) of the pair.</param>
+    /// <param name="component">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetAutoOverride<TFirst, TSecond>(TSecond second, in TFirst component) where TSecond : Enum
+    {
+        ulong secondId = Type<TSecond>.Id(World, second);
+        return ref AutoOverride<TFirst>(secondId).Set(secondId, in component);
+    }
+
+    /// <summary>
+    ///     Set pair, mark component for auto-overriding.
+    /// </summary>
+    /// <param name="first">The first id (enum member) of the pair.</param>
+    /// <param name="component">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetAutoOverride<TFirst, TSecond>(TFirst first, in TSecond component) where TFirst : Enum
+    {
+        ulong firstId = Type<TFirst>.Id(World, first);
+        return ref AutoOverrideSecond<TSecond>(firstId).SetSecond(firstId, in component);
+    }
+
+    /// <summary>
+    ///     Set pair, mark component for auto-overriding.
+    /// </summary>
+    /// <param name="first">The first id of the pair.</param>
+    /// <param name="component">The component data.</param>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetAutoOverrideSecond<TSecond>(ulong first, in TSecond component)
+    {
+        return ref AutoOverrideSecond<TSecond>(first).SetSecond(first, in component);
+    }
+
+    /// <summary>
+    ///     Enable this entity.
+    /// </summary>
+    /// <returns></returns>
+    public ref Entity Enable()
+    {
+        ecs_enable(World, Id, true);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Enable an id for entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity Enable(ulong id)
+    {
+        ecs_enable_id(World, Id, id, true);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Enable pair for entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity Enable(ulong first, ulong second)
+    {
+        return ref Enable(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Enable component for entity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Enable<T>()
+    {
+        return ref Enable(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Enable component for entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Enable<T>(T value) where T : Enum
+    {
+        return ref Enable<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Enable pair for entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref Entity Enable<TFirst>(ulong second)
+    {
+        return ref Enable(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Enable pair for entity.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Enable<TFirst, TSecond>()
+    {
+        return ref Enable(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Enable pair for entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Enable<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Enable<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Enable pair for entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Enable<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref EnableSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Enable pair for entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity EnableSecond<TSecond>(ulong first)
+    {
+        return ref Enable(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Disable this entity.
+    /// </summary>
+    /// <returns></returns>
+    public ref Entity Disable()
+    {
+        ecs_enable(World, Id, false);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Disable an id for entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref Entity Disable(ulong id)
+    {
+        ecs_enable_id(World, Id, id, false);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Disable pair for entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref Entity Disable(ulong first, ulong second)
+    {
+        return ref Disable(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Disable component for entity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Disable<T>()
+    {
+        return ref Disable(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Disable component for entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Disable<T>(T value) where T : Enum
+    {
+        return ref Disable<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Disable pair for entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref Entity Disable<TFirst>(ulong second)
+    {
+        return ref Disable(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Disable pair for entity.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Disable<TFirst, TSecond>()
+    {
+        return ref Disable(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Disable pair for entity.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Disable<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Disable<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Disable pair for entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity Disable<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref DisableSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Disable pair for entity.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity DisableSecond<TSecond>(ulong first)
+    {
+        return ref Disable(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Sets the data of a component.
+    /// </summary>
+    /// <param name="id">The id of the component to set.</param>
+    /// <param name="size">The size of the pointed-to data.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetUntyped(ulong id, int size, void* data)
+    {
+        Ecs.Assert(ecs_get_typeid(World, id) != 0, "Cannot set component data for tag ids.");
+        ecs_set_id(World, Id, id, size, data);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a component.
+    /// </summary>
+    /// <param name="id">The id of the component to set.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetUntyped(ulong id, void* data)
+    {
+        EcsComponent* component = (EcsComponent*)ecs_get_id(World, id, FLECS_IDEcsComponentID_);
+        Ecs.Assert(component != null, nameof(ECS_INVALID_PARAMETER));
+        return ref SetUntyped(id, component->size, data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="first">The first id of the pair.</param>
+    /// <param name="second">The second id of the pair.</param>
+    /// <param name="size">The size of the pointed-to data.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetUntyped(ulong first, ulong second, int size, void* data)
+    {
+        return ref SetUntyped(Ecs.Pair(first, second), size, data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a component.
+    /// </summary>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="T">The component type.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetPtr<T>(T* data)
+    {
+        return ref SetInternal(Type<T>.Id(World), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="second">The second id of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetPtr<TFirst>(ulong second, TFirst* data)
+    {
+        return ref SetInternal(Ecs.Pair<TFirst>(second, World), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of a pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of a pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetPtr<TFirst, TSecond>(TSecond* data)
+    {
+        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetPtr<TFirst, TSecond>(TFirst* data)
+    {
+        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="second">The second id (enum member) of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetPtr<TFirst, TSecond>(TSecond second, TFirst* data) where TSecond : Enum
+    {
+        return ref SetPtr(Type<TSecond>.Id(World, second), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="first">The first id (enum member) of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetPtr<TFirst, TSecond>(TFirst first, TSecond* data) where TFirst : Enum
+    {
+        return ref SetPtrSecond(Type<TFirst>.Id(World, first), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="first">The first id of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetPtrSecond<TSecond>(ulong first, TSecond* data)
+    {
+        return ref SetInternal(Ecs.PairSecond<TSecond>(first, World), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a component.
+    /// </summary>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="T">The component type.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Set<T>(in T data)
+    {
+        return ref SetInternal(Type<T>.Id(World), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="second">The second id of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Set<TFirst>(ulong second, in TFirst data)
+    {
+        return ref SetInternal(Ecs.Pair<TFirst>(second, World), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Set<TFirst, TSecond>(in TSecond data)
+    {
+        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Set<TFirst, TSecond>(in TFirst data)
+    {
+        return ref SetInternal(Ecs.Pair<TFirst, TSecond>(World), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="second">The second id (enum member) of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Set<TFirst, TSecond>(TSecond second, in TFirst data) where TSecond : Enum
+    {
+        return ref Set(Type<TSecond>.Id(World, second), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="first">The first id (enum member) of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Set<TFirst, TSecond>(TFirst first, in TSecond data) where TFirst : Enum
+    {
+        return ref SetSecond(Type<TFirst>.Id(World, first), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="first">The first id of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity SetSecond<TSecond>(ulong first, in TSecond data)
+    {
+        return ref SetInternal(Ecs.PairSecond<TSecond>(first, World), in data);
+    }
+
+    /// <summary>
+    ///     Entities created in function will have the current entity.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity With(Action callback)
+    {
+        ulong prev = ecs_set_with(World, Id);
+        callback();
+        ecs_set_with(World, prev);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Entities created in function will have (first, this).
+    /// </summary>
+    /// <param name="first">The id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity With(ulong first, Action callback)
+    {
+        ulong prev = ecs_set_with(World, Ecs.Pair(first, Id));
+        callback();
+        ecs_set_with(World, prev);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Entities created in function will have (TFirst, this).
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The component id.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity With<TFirst>(Action callback)
+    {
+        return ref With(Type<TFirst>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     Entities created in function will have the current entity.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity With(Ecs.WorldCallback callback)
+    {
+        ulong prev = ecs_set_with(World, Id);
+        callback(World);
+        ecs_set_with(World, prev);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Entities created in function will have (first, this).
+    /// </summary>
+    /// <param name="first">The id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity With(ulong first, Ecs.WorldCallback callback)
+    {
+        ulong prev = ecs_set_with(World, Ecs.Pair(first, Id));
+        callback(World);
+        ecs_set_with(World, prev);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Entities created in function will have (TFirst, this).
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The component id.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref Entity With<TFirst>(Ecs.WorldCallback callback)
+    {
+        return ref With(Type<TFirst>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     The function will be run with the scope set to the current entity.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Scope(Action callback)
+    {
+        ulong prev = ecs_set_scope(World, Id);
+        callback();
+        ecs_set_scope(World, prev);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     The function will be run with the scope set to the current entity.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <returns>Reference to self.</returns>
+    public ref Entity Scope(Ecs.WorldCallback callback)
+    {
+        ulong prev = ecs_set_scope(World, Id);
+        callback(World);
+        ecs_set_scope(World, prev);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set the entity name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref Entity SetName(string name)
+    {
+        using NativeString nativeName = (NativeString)name;
+        ecs_set_name(World, Id, nativeName);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set entity alias.
+    /// </summary>
+    /// <param name="alias"></param>
+    /// <returns></returns>
+    public ref Entity SetAlias(string alias)
+    {
+        using NativeString nativeAlias = (NativeString)alias;
+        ecs_set_alias(World, Id, nativeAlias);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set doc name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref Entity SetDocName(string name)
+    {
+        using NativeString nativeName = (NativeString)name;
+        ecs_doc_set_name(World, Id, nativeName);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set doc brief.
+    /// </summary>
+    /// <param name="brief"></param>
+    /// <returns></returns>
+    public ref Entity SetDocBrief(string brief)
+    {
+        using NativeString nativeBrief = (NativeString)brief;
+        ecs_doc_set_brief(World, Id, nativeBrief);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set doc detailed description.
+    /// </summary>
+    /// <param name="detail"></param>
+    /// <returns></returns>
+    public ref Entity SetDocDetail(string detail)
+    {
+        using NativeString nativeDetail = (NativeString)detail;
+        ecs_doc_set_detail(World, Id, nativeDetail);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set doc link.
+    /// </summary>
+    /// <param name="link"></param>
+    /// <returns></returns>
+    public ref Entity SetDocLink(string link)
+    {
+        using NativeString nativeLink = (NativeString)link;
+        ecs_doc_set_link(World, Id, nativeLink);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set doc color.
+    /// </summary>
+    /// <param name="color"></param>
+    /// <returns></returns>
+    public ref Entity SetDocColor(string color)
+    {
+        using NativeString nativeColor = (NativeString)color;
+        ecs_doc_set_color(World, Id, nativeColor);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set doc uuid.
+    /// </summary>
+    /// <param name="uuid">The uuid string.</param>
+    /// <returns></returns>
+    public ref Entity SetDocUuid(string uuid)
+    {
+        using NativeString nativeUuid = (NativeString)uuid;
+        ecs_doc_set_uuid(World, Id, nativeUuid);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Make entity a unit.
+    /// </summary>
+    /// <param name="symbol"></param>
+    /// <param name="prefix"></param>
+    /// <param name="base"></param>
+    /// <param name="over"></param>
+    /// <param name="factor"></param>
+    /// <param name="power"></param>
+    /// <returns></returns>
+    public ref Entity Unit(
+        string symbol,
+        ulong prefix = 0,
+        ulong @base = 0,
+        ulong over = 0,
+        int factor = 0,
+        int power = 0)
+    {
+        using NativeString nativeSymbol = (NativeString)symbol;
+
+        ecs_unit_desc_t desc = default;
+        desc.symbol = nativeSymbol;
+        desc.entity = Id;
+        desc.@base = @base;
+        desc.over = over;
+        desc.prefix = prefix;
+        desc.translation.factor = factor;
+        desc.translation.power = power;
+        ecs_unit_init(World, &desc);
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Make entity a derived unit.
+    /// </summary>
+    /// <param name="prefix"></param>
+    /// <param name="base"></param>
+    /// <param name="over"></param>
+    /// <param name="factor"></param>
+    /// <param name="power"></param>
+    /// <returns></returns>
+    public ref Entity Unit(
+        ulong prefix = 0,
+        ulong @base = 0,
+        ulong over = 0,
+        int factor = 0,
+        int power = 0)
+    {
+        ecs_unit_desc_t desc = default;
+        desc.entity = Id;
+        desc.@base = @base;
+        desc.over = over;
+        desc.prefix = prefix;
+        desc.translation.factor = factor;
+        desc.translation.power = power;
+        ecs_unit_init(World, &desc);
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Make unit a prefix.
+    /// </summary>
+    /// <param name="symbol"></param>
+    /// <param name="factor"></param>
+    /// <param name="power"></param>
+    /// <returns></returns>
+    public ref Entity UnitPrefix(string symbol, int factor = 0, int power = 0)
+    {
+        using NativeString nativeSymbol = (NativeString)symbol;
+
+        ecs_unit_prefix_desc_t desc = default;
+        desc.entity = Id;
+        desc.symbol = nativeSymbol;
+        desc.translation.factor = factor;
+        desc.translation.power = power;
+        ecs_unit_prefix_init(World, &desc);
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Add quantity to unit.
+    /// </summary>
+    /// <param name="quantity"></param>
+    /// <returns></returns>
+    public ref Entity Quantity(ulong quantity)
+    {
+        ecs_add_id(World, Id, Ecs.Pair(EcsQuantity, quantity));
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Make entity a quantity.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Quantity<T>()
+    {
+        return ref Quantity(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Make entity a quantity.
+    /// </summary>
+    /// <returns></returns>
+    public ref Entity Quantity()
+    {
+        ecs_add_id(World, Id, EcsQuantity);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set component from JSON.
+    /// </summary>
+    /// <param name="e"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <returns></returns>
+    public ref Entity SetJson(ulong e, string json, ecs_from_json_desc_t* desc = null)
+    {
+        ulong type = ecs_get_typeid(World, e);
+
+        if (type == 0)
+        {
+            Ecs.Error("Id is not a type");
+            return ref this;
+        }
+
+        void* ptr = ecs_ensure_id(World, Id, e);
+        Ecs.Assert(ptr != null, nameof(ECS_INTERNAL_ERROR));
+
+        using NativeString nativeJson = (NativeString)json;
+
+        ecs_ptr_from_json(World, type, ptr, nativeJson, desc);
+        ecs_modified_id(World, Id, e);
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set pair from JSON.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <returns></returns>
+    public ref Entity SetJson(ulong first, ulong second, string json, ecs_from_json_desc_t* desc = null)
+    {
+        return ref SetJson(Ecs.Pair(first, second), json, desc);
+    }
+
+    /// <summary>
+    ///     Set component from JSON.
+    /// </summary>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity SetJson<T>(string json, ecs_from_json_desc_t* desc = null)
+    {
+        return ref SetJson(Type<T>.Id(World), json, desc);
+    }
+
+    /// <summary>
+    ///     Set pair from JSON.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref Entity SetJson<TFirst>(ulong second, string json, ecs_from_json_desc_t* desc = null)
+    {
+        return ref SetJson(Ecs.Pair<TFirst>(second, World), json, desc);
+    }
+
+    /// <summary>
+    ///     Set pair from JSON.
+    /// </summary>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity SetJson<TFirst, TSecond>(string json, ecs_from_json_desc_t* desc = null)
+    {
+        return ref SetJson(Ecs.Pair<TFirst, TSecond>(World), json, desc);
+    }
+
+    /// <summary>
+    ///     Set pair from JSON.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity SetJson<TFirst, TSecond>(TSecond second, string json, ecs_from_json_desc_t* desc = null)
+        where TSecond : Enum
+    {
+        return ref SetJson<TFirst>(Type<TSecond>.Id(World, second), json, desc);
+    }
+
+    /// <summary>
+    ///     Set pair from JSON.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity SetJson<TFirst, TSecond>(TFirst first, string json, ecs_from_json_desc_t* desc = null)
+        where TFirst : Enum
+    {
+        return ref SetJsonSecond<TSecond>(Type<TFirst>.Id(World, first), json, desc);
+    }
+
+    /// <summary>
+    ///     Set pair from JSON.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref Entity SetJsonSecond<TSecond>(ulong first, string json, ecs_from_json_desc_t* desc = null)
+    {
+        return ref SetJson(first, Type<TSecond>.Id(World), json, desc);
+    }
+
+    /// <summary>
+    ///     Observe an event on this entity.
+    /// </summary>
+    /// <param name="eventId"></param>
+    /// <param name="callback"></param>
+    /// <returns></returns>
+    public ref Entity Observe(ulong eventId, Action callback)
+    {
+        return ref ObserveInternal(eventId, callback, (delegate*<ecs_iter_t*, void>)&Functions.ActionCallbackDelegate);
+    }
+
+    /// <summary>
+    ///     Observe an event on this entity.
+    /// </summary>
+    /// <param name="eventId"></param>
+    /// <param name="callback"></param>
+    /// <returns></returns>
+    public ref Entity Observe(ulong eventId, Ecs.ObserveEntityCallback callback)
+    {
+        return ref ObserveInternal(eventId, callback, (delegate*<ecs_iter_t*, void>)&Functions.ObserveEntityCallbackDelegate);
+    }
+
+    /// <summary>
+    ///     Observe an event on this entity.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Observe<T>(Action callback)
+    {
+        return ref Observe(Type<T>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     Observe an event on this entity.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Observe<T>(Ecs.ObserveEntityCallback callback)
+    {
+        return ref Observe(Type<T>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     Observe an event on this entity.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Observe<T>(Ecs.ObserveRefCallback<T> callback)
+    {
+        return ref ObserveInternal(Type<T>.Id(World), callback, (delegate*<ecs_iter_t*, void>)&Functions.ObserveRefCallbackDelegate<T>);
+    }
+
+    /// <summary>
+    ///     Observe an event on this entity.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref Entity Observe<T>(Ecs.ObserveEntityRefCallback<T> callback)
+    {
+        return ref ObserveInternal(Type<T>.Id(World), callback, (delegate*<ecs_iter_t*, void>)&Functions.ObserveEntityRefCallbackDelegate<T>);
+    }
+
+    /// <summary>
+    ///     Get mutable component value (untyped).
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public void* EnsurePtr(ulong id)
+    {
+        return ecs_ensure_id(World, Id, id);
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair (untyped).
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public void* EnsurePtr(ulong first, ulong second)
+    {
+        return EnsurePtr(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Get mutable component value.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* EnsurePtr<T>() where T : unmanaged
+    {
+        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (T*)ecs_ensure_id(World, Id, Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for the first element of a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public TFirst* EnsurePtr<TFirst>(ulong second) where TFirst : unmanaged
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TFirst*)EnsurePtr(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* EnsurePtr<TFirst, TSecond>(TSecond second)
+        where TFirst : unmanaged
+        where TSecond : Enum
+    {
+        return EnsurePtr<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* EnsurePtr<TFirst, TSecond>(TFirst first)
+        where TFirst : Enum
+        where TSecond : unmanaged
+    {
+        return EnsureSecondPtr<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* EnsureFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TFirst*)EnsurePtr(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* EnsureSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TSecond*)EnsurePtr(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer for a pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* EnsureSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return (TSecond*)EnsurePtr(Ecs.PairSecond<TSecond>(first, World));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref T Ensure<T>()
+    {
+        Ecs.Assert(Type<T>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<T>(ecs_ensure_id(World, Id, Type<T>.Id(World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for the first element of a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref TFirst Ensure<TFirst>(ulong second)
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TFirst>(EnsurePtr(Ecs.Pair<TFirst>(second, World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst Ensure<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Ensure<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond Ensure<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref EnsureSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst EnsureFirst<TFirst, TSecond>()
+    {
+        Ecs.Assert(Type<TFirst>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TFirst>(EnsurePtr(Ecs.Pair<TFirst, TSecond>(World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond EnsureSecond<TFirst, TSecond>()
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TSecond>(EnsurePtr(Ecs.Pair<TFirst, TSecond>(World)));
+    }
+
+    /// <summary>
+    ///     Get mutable managed reference for pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond EnsureSecond<TSecond>(ulong first)
+    {
+        Ecs.Assert(Type<TSecond>.Size != 0, nameof(ECS_INVALID_PARAMETER));
+        return ref Managed.GetTypeRef<TSecond>(EnsurePtr(Ecs.PairSecond<TSecond>(first, World)));
+    }
+
+    /// <summary>
+    ///     Signal that component was modified.
+    /// </summary>
+    /// <param name="id"></param>
+    public void Modified(ulong id)
+    {
+        ecs_modified_id(World, Id, id);
+    }
+
+    /// <summary>
+    ///     Signal that pair was modified.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    public void Modified(ulong first, ulong second)
+    {
+        Modified(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Signal that component was modified.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Modified<T>()
+    {
+        Modified(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Signal that component was modified.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Modified<T>(T value) where T : Enum
+    {
+        Modified<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Signal that a pair was modified.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Modified<TFirst>(ulong second)
+    {
+        Modified(Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Signal that a pair was modified.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Modified<TFirst, TSecond>()
+    {
+        Modified(Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Signal that a pair was modified.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Modified<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Modified<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Signal that a pair was modified.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Modified<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        ModifiedSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Signal that a pair was modified.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    public void ModifiedSecond<TSecond>(ulong first)
+    {
+        Modified(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Get reference to component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Ref<T> GetRef<T>()
+    {
+        return new Ref<T>(World, Id);
+    }
+
+    /// <summary>
+    ///     Get ref to pair component.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public Ref<TFirst> GetRef<TFirst>(ulong second)
+    {
+        return new Ref<TFirst>(World, Id, Ecs.Pair<TFirst>(second, World));
+    }
+
+    /// <summary>
+    ///     Get ref to pair component.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TFirst> GetRef<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return GetRef<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Get ref to pair component.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TSecond> GetRef<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return GetRefSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Get ref to pair component.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TFirst> GetRefFirst<TFirst, TSecond>()
+    {
+        return new Ref<TFirst>(World, Id, Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get ref to pair component.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TSecond> GetRefSecond<TFirst, TSecond>()
+    {
+        return new Ref<TSecond>(World, Id, Ecs.Pair<TFirst, TSecond>(World));
+    }
+
+    /// <summary>
+    ///     Get ref to pair component.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TSecond> GetRefSecond<TSecond>(ulong first)
+    {
+        return new Ref<TSecond>(World, Id, Ecs.PairSecond<TSecond>(first, World));
+    }
+
+    /// <summary>
+    ///     Clear an entity.
+    /// </summary>
+    public void Clear()
+    {
+        ecs_clear(World, Id);
+    }
+
+    /// <summary>
+    ///     Delete an entity.
+    /// </summary>
+    public void Destruct()
+    {
+        ecs_delete(World, Id);
+    }
+
+    /// <summary>
+    ///     Deserialize entity to JSON.
+    /// </summary>
+    /// <param name="json"></param>
+    /// <returns></returns>
+    public string FromJson(string json)
+    {
+        using NativeString nativeJson = (NativeString)json;
+        return NativeString.GetString(ecs_entity_from_json(World, Id, nativeJson, null));
+    }
+
+    public void SetChildOrder(ulong[] children)
+    {
+        fixed (ulong* childrenPtr = children)
+        {
+            ecs_set_child_order(World, Id, childrenPtr, children.Length);
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private ref Entity SetInternal<T>(ulong id, in T component)
+    {
+        fixed (T* ptr = &component)
+            return ref SetInternal(id, ptr);
+    }
+
+    private ref Entity SetInternal<T>(ulong id, T* component)
+    {
+        Ecs.Assert(!Type<T>.IsTag, "Empty structs can't be used as components. Use .Add() to add them as tags instead.");
+
+#if DEBUG
+        if (Ecs.IsPair(id) && !Ecs.TypeIdIs<T>(World, id))
+        {
+            Id pair = new Id(World, id);
+            Entity expected = new Entity(World, ecs_get_typeid(World, id));
+            Entity provided = new Entity(World, Type<T>.Id(World));
+
+            Ecs.Error(expected == 0
+                ? $"Attempted to set component data for tag pair.\n[Pair]: {pair}"
+                : $"Attempted to set component data for incorrect pair type.\n[Pair]: {pair}\n[Expected Type]: {expected}\n[Provided Type]: {provided}");
+
+            return ref this;
+        }
+#endif
+
+        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+        {
+            Managed.AllocGcHandle(component, out GCHandle handle);
+            ecs_set_id(World, Id, id, sizeof(GCHandle), &handle);
+            Managed.FreeGcHandle(handle);
+        }
+        else
+        {
+            ecs_set_id(World, Id, id, sizeof(T), component);
+        }
+
+        return ref this;
+    }
+
+    private ref Entity ObserveInternal<T>(ulong eventId, T callback, void* invoker) where T : Delegate
+    {
+        IteratorContext* iteratorContext = Memory.AllocZeroed<IteratorContext>(1);
+        iteratorContext->Callback.Set(callback, invoker);
+
+        ecs_observer_desc_t desc = default;
+        desc.events[0] = eventId;
+        desc.query.terms[0].id = EcsAny;
+        desc.query.terms[0].src.id = Id;
+        desc.callback = &Functions.IteratorCallback;
+        desc.callback_ctx = iteratorContext;
+        desc.callback_ctx_free = &Functions.IteratorContextFree;
+
+        ulong observer = ecs_observer_init(World, &desc);
+        ecs_add_id(World, observer, Ecs.Pair(EcsChildOf, Id));
+
+        return ref this;
+    }
+
+    private ref Entity ObserveInternal<T>(ulong eventId, void* callback, void* invoker) where T : Delegate
+    {
+        IteratorContext* iteratorContext = Memory.AllocZeroed<IteratorContext>(1);
+        iteratorContext->Callback.Set(callback, invoker);
+
+        ecs_observer_desc_t desc = default;
+        desc.events[0] = eventId;
+        desc.query.terms[0].id = EcsAny;
+        desc.query.terms[0].src.id = Id;
+        desc.callback = &Functions.IteratorCallback;
+        desc.callback_ctx = iteratorContext;
+        desc.callback_ctx_free = &Functions.IteratorContextFree;
+
+        ulong observer = ecs_observer_init(World, &desc);
+        ecs_add_id(World, observer, Ecs.Pair(EcsChildOf, Id));
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Converts an <see cref="Entity"/> instance to its integer id.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public static implicit operator ulong(Entity entity)
+    {
+        return ToUInt64(entity);
+    }
+
+    /// <summary>
+    ///     Converts an <see cref="Entity"/> instance to its id.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public static implicit operator Id(Entity entity)
+    {
+        return ToId(entity);
+    }
+
+    /// <summary>
+    ///     Converts an <see cref="Entity"/> instance to its integer id.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public static ulong ToUInt64(Entity entity)
+    {
+        return entity.Id.Value;
+    }
+
+    /// <summary>
+    ///     Converts an <see cref="Entity"/> instance to its id.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public static Id ToId(Entity entity)
+    {
+        return entity.Id;
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Entity"/> instances are equal.
+    /// </summary>
+    /// <param name="other"></param>
+    /// <returns></returns>
+    public bool Equals(Entity other)
+    {
+        return Id.Value == other.Id.Value;
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Entity"/> instances are equal.
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is Entity entity && Equals(entity);
+    }
+
+    /// <summary>
+    ///     Returns the hash code of the <see cref="Entity"/>.
+    /// </summary>
+    /// <returns></returns>
+    public override int GetHashCode()
+    {
+        return Id.Value.GetHashCode();
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Entity"/> instances are equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator ==(Entity left, Entity right)
+    {
+        return left.Equals(right);
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Entity"/> instances are not equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator !=(Entity left, Entity right)
+    {
+        return !(left == right);
+    }
+
+    /// <summary>
+    ///     Returns the entity's name if it has one, otherwise return its id.
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        return Id.ToString();
+    }
+}
diff --git a/src/Flecs.NET/Core/IQueryBuilder.cs b/src/Flecs.NET/Core/IQueryBuilder.cs
index 94aa9271..47d28e6c 100644
--- a/src/Flecs.NET/Core/IQueryBuilder.cs
+++ b/src/Flecs.NET/Core/IQueryBuilder.cs
@@ -1,461 +1,463 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-/// <summary>
-///     Query builder interface.
-/// </summary>
-/// <typeparam name="TBuilder"></typeparam>
-/// <typeparam name="TResult"></typeparam>
-[SuppressMessage("Naming", "CA1716:Identifiers should not match keywords")]
-public unsafe interface IQueryBuilder<TBuilder, TResult> : IQueryBuilderBase
-{
-    /// <summary>
-    ///     Builds the query and returns the newly created TResult object.
-    /// </summary>
-    /// <returns>The created TResult object.</returns>
-    public TResult Build();
-
-    /// <inheritdoc cref="QueryBuilder.Self()"/>
-    public ref TBuilder Self();
-
-    /// <inheritdoc cref="QueryBuilder.Id(ulong)"/>
-    public ref TBuilder Id(ulong id);
-
-    /// <inheritdoc cref="QueryBuilder.Entity(ulong)"/>
-    public ref TBuilder Entity(ulong entity);
-
-    /// <inheritdoc cref="QueryBuilder.Name(string)"/>
-    public ref TBuilder Name(string name);
-
-    /// <inheritdoc cref="QueryBuilder.Var(string)"/>
-    public ref TBuilder Var(string name);
-
-    /// <inheritdoc cref="QueryBuilder.Term(ulong)"/>
-    public ref TBuilder Term(ulong id);
-
-    /// <inheritdoc cref="QueryBuilder.Src()"/>
-    public ref TBuilder Src();
-
-    /// <inheritdoc cref="QueryBuilder.First()"/>
-    public ref TBuilder First();
-
-    /// <inheritdoc cref="QueryBuilder.Second()"/>
-    public ref TBuilder Second();
-
-    /// <inheritdoc cref="QueryBuilder.Src(ulong)"/>
-    public ref TBuilder Src(ulong srcId);
-
-    /// <inheritdoc cref="QueryBuilder.Src{T}()"/>
-    public ref TBuilder Src<T>();
-
-    /// <inheritdoc cref="QueryBuilder.Src{T}(T)"/>
-    public ref TBuilder Src<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Src(string)"/>
-    public ref TBuilder Src(string name);
-
-    /// <inheritdoc cref="QueryBuilder.First(ulong)"/>
-    public ref TBuilder First(ulong firstId);
-
-    /// <inheritdoc cref="QueryBuilder.First{T}()"/>
-    public ref TBuilder First<T>();
-
-    /// <inheritdoc cref="QueryBuilder.First{T}(T)"/>
-    public ref TBuilder First<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.First(string)"/>
-    public ref TBuilder First(string name);
-
-    /// <inheritdoc cref="QueryBuilder.Second(ulong)"/>
-    public ref TBuilder Second(ulong secondId);
-
-    /// <inheritdoc cref="QueryBuilder.Second{T}()"/>
-    public ref TBuilder Second<T>();
-
-    /// <inheritdoc cref="QueryBuilder.Second{T}(T)"/>
-    public ref TBuilder Second<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Second(string)"/>
-    public ref TBuilder Second(string secondName);
-
-    /// <inheritdoc cref="QueryBuilder.Up(ulong)"/>
-    public ref TBuilder Up(ulong traverse = 0);
-
-    /// <inheritdoc cref="QueryBuilder.Up{T}()"/>
-    public ref TBuilder Up<T>();
-
-    /// <inheritdoc cref="QueryBuilder.Up{T}(T)"/>
-    public ref TBuilder Up<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Cascade(ulong)"/>
-    public ref TBuilder Cascade(ulong traverse = 0);
-
-    /// <inheritdoc cref="QueryBuilder.Cascade{T}()"/>
-    public ref TBuilder Cascade<T>();
-
-    /// <inheritdoc cref="QueryBuilder.Cascade{T}(T)"/>
-    public ref TBuilder Cascade<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Descend()"/>
-    public ref TBuilder Descend();
-
-    /// <inheritdoc cref="QueryBuilder.Parent()"/>
-    public ref TBuilder Parent();
-
-    /// <inheritdoc cref="QueryBuilder.Trav(ulong, uint)"/>
-    public ref TBuilder Trav(ulong traverse, uint flags = 0);
-
-    /// <inheritdoc cref="QueryBuilder.Trav{T}(uint)"/>
-    public ref TBuilder Trav<T>(uint flags = 0);
-
-    /// <inheritdoc cref="QueryBuilder.Trav{T}(T, uint)"/>
-    public ref TBuilder Trav<T>(T value, uint flags = 0) where T : Enum;
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref TBuilder Flags(ulong flags);
-
-    /// <inheritdoc cref="QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref TBuilder InOut(ecs_inout_kind_t inOut);
-
-    /// <inheritdoc cref="QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref TBuilder InOutStage(ecs_inout_kind_t inOut);
-
-    /// <inheritdoc cref="QueryBuilder.Write()"/>
-    public ref TBuilder Write();
-
-    /// <inheritdoc cref="QueryBuilder.Read()"/>
-    public ref TBuilder Read();
-
-    /// <inheritdoc cref="QueryBuilder.ReadWrite()"/>
-    public ref TBuilder ReadWrite();
-
-    /// <inheritdoc cref="QueryBuilder.In()"/>
-    public ref TBuilder In();
-
-    /// <inheritdoc cref="QueryBuilder.Out()"/>
-    public ref TBuilder Out();
-
-    /// <inheritdoc cref="QueryBuilder.InOut()"/>
-    public ref TBuilder InOut();
-
-    /// <inheritdoc cref="QueryBuilder.InOutNone()"/>
-    public ref TBuilder InOutNone();
-
-    /// <inheritdoc cref="QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref TBuilder Oper(ecs_oper_kind_t oper);
-
-    /// <inheritdoc cref="QueryBuilder.And()"/>
-    public ref TBuilder And();
-
-    /// <inheritdoc cref="QueryBuilder.Or()"/>
-    public ref TBuilder Or();
-
-    /// <inheritdoc cref="QueryBuilder.Not()"/>
-    public ref TBuilder Not();
-
-    /// <inheritdoc cref="QueryBuilder.Optional()"/>
-    public ref TBuilder Optional();
-
-    /// <inheritdoc cref="QueryBuilder.AndFrom()"/>
-    public ref TBuilder AndFrom();
-
-    /// <inheritdoc cref="QueryBuilder.OrFrom()"/>
-    public ref TBuilder OrFrom();
-
-    /// <inheritdoc cref="QueryBuilder.NotFrom()"/>
-    public ref TBuilder NotFrom();
-
-    /// <inheritdoc cref="QueryBuilder.Singleton()"/>
-    public ref TBuilder Singleton();
-
-    /// <inheritdoc cref="QueryBuilder.Filter()"/>
-    public ref TBuilder Filter();
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref TBuilder QueryFlags(uint flags);
-
-    /// <inheritdoc cref="QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref TBuilder CacheKind(ecs_query_cache_kind_t kind);
-
-    /// <inheritdoc cref="QueryBuilder.Cached()"/>
-    public ref TBuilder Cached();
-
-    /// <inheritdoc cref="QueryBuilder.Expr(string)"/>
-    public ref TBuilder Expr(string expr);
-
-    /// <inheritdoc cref="QueryBuilder.With(Core.Term)"/>
-    public ref TBuilder With(Term term);
-
-    /// <inheritdoc cref="QueryBuilder.With(ulong)"/>
-    public ref TBuilder With(ulong id);
-
-    /// <inheritdoc cref="QueryBuilder.With(string)"/>
-    public ref TBuilder With(string name);
-
-    /// <inheritdoc cref="QueryBuilder.With(ulong, ulong)"/>
-    public ref TBuilder With(ulong first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.With(ulong, string)"/>
-    public ref TBuilder With(ulong first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.With(string, ulong)"/>
-    public ref TBuilder With(string first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.With(string, string)"/>
-    public ref TBuilder With(string first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.With{T}()"/>
-    public ref TBuilder With<T>();
-
-    /// <inheritdoc cref="QueryBuilder.With{T}(T)"/>
-    public ref TBuilder With<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.With{T1}(ulong)"/>
-    public ref TBuilder With<TFirst>(ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.With{T1}(string)"/>
-    public ref TBuilder With<TFirst>(string second);
-
-    /// <inheritdoc cref="QueryBuilder.With{T1, T2}()"/>
-    public ref TBuilder With<TFirst, TSecond>();
-
-    /// <inheritdoc cref="QueryBuilder.With{T1, T2}(T2)"/>
-    public ref TBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.With{T1, T2}(T1)"/>
-    public ref TBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.With{T1}(T1, string)"/>
-    public ref TBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.With{T2}(string, T2)"/>
-    public ref TBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref TBuilder WithSecond<TSecond>(ulong first);
-
-    /// <inheritdoc cref="QueryBuilder.WithSecond{T2}(string)"/>
-    public ref TBuilder WithSecond<TSecond>(string first);
-
-    /// <inheritdoc cref="QueryBuilder.Without(Core.Term)"/>
-    public ref TBuilder Without(Term term);
-
-    /// <inheritdoc cref="QueryBuilder.Without(ulong)"/>
-    public ref TBuilder Without(ulong id);
-
-    /// <inheritdoc cref="QueryBuilder.Without(string)"/>
-    public ref TBuilder Without(string name);
-
-    /// <inheritdoc cref="QueryBuilder.Without(ulong, ulong)"/>
-    public ref TBuilder Without(ulong first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Without(ulong, string)"/>
-    public ref TBuilder Without(ulong first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.Without(string, ulong)"/>
-    public ref TBuilder Without(string first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Without(string, string)"/>
-    public ref TBuilder Without(string first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.Without{T}()"/>
-    public ref TBuilder Without<T>();
-
-    /// <inheritdoc cref="QueryBuilder.Without{T}(T)"/>
-    public ref TBuilder Without<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Without{T1}(ulong)"/>
-    public ref TBuilder Without<TFirst>(ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Without{T1}(string)"/>
-    public ref TBuilder Without<TFirst>(string second);
-
-    /// <inheritdoc cref="QueryBuilder.Without{T1, T2}()"/>
-    public ref TBuilder Without<TFirst, TSecond>();
-
-    /// <inheritdoc cref="QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref TBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref TBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Without{T1}(T1, string)"/>
-    public ref TBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Without{T2}(string, T2)"/>
-    public ref TBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref TBuilder WithoutSecond<TSecond>(ulong first);
-
-    /// <inheritdoc cref="QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref TBuilder WithoutSecond<TSecond>(string first);
-
-    /// <inheritdoc cref="QueryBuilder.Write(Core.Term)"/>
-    public ref TBuilder Write(Term term);
-
-    /// <inheritdoc cref="QueryBuilder.Write(ulong)"/>
-    public ref TBuilder Write(ulong id);
-
-    /// <inheritdoc cref="QueryBuilder.Write(string)"/>
-    public ref TBuilder Write(string name);
-
-    /// <inheritdoc cref="QueryBuilder.Write(ulong, ulong)"/>
-    public ref TBuilder Write(ulong first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Write(ulong, string)"/>
-    public ref TBuilder Write(ulong first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.Write(string, ulong)"/>
-    public ref TBuilder Write(string first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Write(string, string)"/>
-    public ref TBuilder Write(string first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.Write{T}()"/>
-    public ref TBuilder Write<T>();
-
-    /// <inheritdoc cref="QueryBuilder.Write{T}(T)"/>
-    public ref TBuilder Write<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Write{T1}(ulong)"/>
-    public ref TBuilder Write<TFirst>(ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Write{T1}(string)"/>
-    public ref TBuilder Write<TFirst>(string second);
-
-    /// <inheritdoc cref="QueryBuilder.Write{T1, T2}()"/>
-    public ref TBuilder Write<TFirst, TSecond>();
-
-    /// <inheritdoc cref="QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref TBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref TBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Write{T1}(T1, string)"/>
-    public ref TBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Write{T2}(string, T2)"/>
-    public ref TBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref TBuilder WriteSecond<TSecond>(ulong first);
-
-    /// <inheritdoc cref="QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref TBuilder WriteSecond<TSecond>(string first);
-
-    /// <inheritdoc cref="QueryBuilder.Read(Core.Term)"/>
-    public ref TBuilder Read(Term term);
-
-    /// <inheritdoc cref="QueryBuilder.Read(ulong)"/>
-    public ref TBuilder Read(ulong id);
-
-    /// <inheritdoc cref="QueryBuilder.Read(string)"/>
-    public ref TBuilder Read(string name);
-
-    /// <inheritdoc cref="QueryBuilder.Read(ulong, ulong)"/>
-    public ref TBuilder Read(ulong first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Read(ulong, string)"/>
-    public ref TBuilder Read(ulong first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.Read(string, ulong)"/>
-    public ref TBuilder Read(string first, ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Read(string, string)"/>
-    public ref TBuilder Read(string first, string second);
-
-    /// <inheritdoc cref="QueryBuilder.Read{T}()"/>
-    public ref TBuilder Read<T>();
-
-    /// <inheritdoc cref="QueryBuilder.Read{T}(T)"/>
-    public ref TBuilder Read<T>(T value) where T : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Read{T1}(ulong)"/>
-    public ref TBuilder Read<TFirst>(ulong second);
-
-    /// <inheritdoc cref="QueryBuilder.Read{T1}(string)"/>
-    public ref TBuilder Read<TFirst>(string second);
-
-    /// <inheritdoc cref="QueryBuilder.Read{T1, T2}()"/>
-    public ref TBuilder Read<TFirst, TSecond>();
-
-    /// <inheritdoc cref="QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref TBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref TBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Read{T1}(T1, string)"/>
-    public ref TBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.Read{T2}(string, T2)"/>
-    public ref TBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum;
-
-    /// <inheritdoc cref="QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref TBuilder ReadSecond<TSecond>(ulong first);
-
-    /// <inheritdoc cref="QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref TBuilder ReadSecond<TSecond>(string first);
-
-    /// <inheritdoc cref="QueryBuilder.ScopeOpen()"/>
-    public ref TBuilder ScopeOpen();
-
-    /// <inheritdoc cref="QueryBuilder.ScopeClose()"/>
-    public ref TBuilder ScopeClose();
-
-    /// <inheritdoc cref="QueryBuilder.Term()"/>
-    public ref TBuilder Term();
-
-    /// <inheritdoc cref="QueryBuilder.TermAt(int)"/>
-    public ref TBuilder TermAt(int termIndex);
-
-    /// <inheritdoc cref="QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref TBuilder OrderBy(ulong component, Ecs.OrderByCallback callback);
-
-    /// <inheritdoc cref="QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref TBuilder OrderBy<T>(Ecs.OrderByCallback callback);
-
-    /// <inheritdoc cref="QueryBuilder.GroupBy(ulong)"/>
-    public ref TBuilder GroupBy(ulong component);
-
-    /// <inheritdoc cref="QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref TBuilder GroupBy(ulong component, Ecs.GroupByCallback callback);
-
-    /// <inheritdoc cref="QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref TBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback);
-
-    /// <inheritdoc cref="QueryBuilder.GroupBy{T}()"/>
-    public ref TBuilder GroupBy<T>();
-
-    /// <inheritdoc cref="QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref TBuilder GroupBy<T>(Ecs.GroupByCallback callback);
-
-    /// <inheritdoc cref="QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref TBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback);
-
-    /// <inheritdoc cref="QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref TBuilder GroupByCtx<T>(T value);
-
-    /// <inheritdoc cref="QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref TBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback);
-
-    /// <inheritdoc cref="QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref TBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback);
-
-    /// <inheritdoc cref="QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref TBuilder OnGroupCreate(Ecs.GroupCreateCallback callback);
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref TBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback);
-
-    /// <inheritdoc cref="QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref TBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback);
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref TBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback);
-}
+using System;
+using System.Diagnostics.CodeAnalysis;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+/// <summary>
+///     Query builder interface.
+/// </summary>
+/// <typeparam name="TBuilder"></typeparam>
+/// <typeparam name="TResult"></typeparam>
+[SuppressMessage("Naming", "CA1716:Identifiers should not match keywords")]
+public unsafe interface IQueryBuilder<TBuilder, TResult> : IQueryBuilderBase
+{
+    /// <summary>
+    ///     Builds the query and returns the newly created TResult object.
+    /// </summary>
+    /// <returns>The created TResult object.</returns>
+    public TResult Build();
+
+    /// <inheritdoc cref="QueryBuilder.Self()"/>
+    public ref TBuilder Self();
+
+    /// <inheritdoc cref="QueryBuilder.Id(ulong)"/>
+    public ref TBuilder Id(ulong id);
+
+    /// <inheritdoc cref="QueryBuilder.Entity(ulong)"/>
+    public ref TBuilder Entity(ulong entity);
+
+    /// <inheritdoc cref="QueryBuilder.Name(string)"/>
+    public ref TBuilder Name(string name);
+
+    /// <inheritdoc cref="QueryBuilder.Var(string)"/>
+    public ref TBuilder Var(string name);
+
+    /// <inheritdoc cref="QueryBuilder.Term(ulong)"/>
+    public ref TBuilder Term(ulong id);
+
+    /// <inheritdoc cref="QueryBuilder.Src()"/>
+    public ref TBuilder Src();
+
+    /// <inheritdoc cref="QueryBuilder.First()"/>
+    public ref TBuilder First();
+
+    /// <inheritdoc cref="QueryBuilder.Second()"/>
+    public ref TBuilder Second();
+
+    /// <inheritdoc cref="QueryBuilder.Src(ulong)"/>
+    public ref TBuilder Src(ulong srcId);
+
+    /// <inheritdoc cref="QueryBuilder.Src{T}()"/>
+    public ref TBuilder Src<T>();
+
+    /// <inheritdoc cref="QueryBuilder.Src{T}(T)"/>
+    public ref TBuilder Src<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Src(string)"/>
+    public ref TBuilder Src(string name);
+
+    /// <inheritdoc cref="QueryBuilder.First(ulong)"/>
+    public ref TBuilder First(ulong firstId);
+
+    /// <inheritdoc cref="QueryBuilder.First{T}()"/>
+    public ref TBuilder First<T>();
+
+    /// <inheritdoc cref="QueryBuilder.First{T}(T)"/>
+    public ref TBuilder First<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.First(string)"/>
+    public ref TBuilder First(string name);
+
+    /// <inheritdoc cref="QueryBuilder.Second(ulong)"/>
+    public ref TBuilder Second(ulong secondId);
+
+    /// <inheritdoc cref="QueryBuilder.Second{T}()"/>
+    public ref TBuilder Second<T>();
+
+    /// <inheritdoc cref="QueryBuilder.Second{T}(T)"/>
+    public ref TBuilder Second<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Second(string)"/>
+    public ref TBuilder Second(string secondName);
+
+    /// <inheritdoc cref="QueryBuilder.Up(ulong)"/>
+    public ref TBuilder Up(ulong traverse = 0);
+
+    /// <inheritdoc cref="QueryBuilder.Up{T}()"/>
+    public ref TBuilder Up<T>();
+
+    /// <inheritdoc cref="QueryBuilder.Up{T}(T)"/>
+    public ref TBuilder Up<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Cascade(ulong)"/>
+    public ref TBuilder Cascade(ulong traverse = 0);
+
+    /// <inheritdoc cref="QueryBuilder.Cascade{T}()"/>
+    public ref TBuilder Cascade<T>();
+
+    /// <inheritdoc cref="QueryBuilder.Cascade{T}(T)"/>
+    public ref TBuilder Cascade<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Descend()"/>
+    public ref TBuilder Descend();
+
+    /// <inheritdoc cref="QueryBuilder.Parent()"/>
+    public ref TBuilder Parent();
+
+    /// <inheritdoc cref="QueryBuilder.Trav(ulong, uint)"/>
+    public ref TBuilder Trav(ulong traverse, uint flags = 0);
+
+    /// <inheritdoc cref="QueryBuilder.Trav{T}(uint)"/>
+    public ref TBuilder Trav<T>(uint flags = 0);
+
+    /// <inheritdoc cref="QueryBuilder.Trav{T}(T, uint)"/>
+    public ref TBuilder Trav<T>(T value, uint flags = 0) where T : Enum;
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref TBuilder Flags(ulong flags);
+
+    /// <inheritdoc cref="QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref TBuilder InOut(ecs_inout_kind_t inOut);
+
+    /// <inheritdoc cref="QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref TBuilder InOutStage(ecs_inout_kind_t inOut);
+
+    /// <inheritdoc cref="QueryBuilder.Write()"/>
+    public ref TBuilder Write();
+
+    /// <inheritdoc cref="QueryBuilder.Read()"/>
+    public ref TBuilder Read();
+
+    /// <inheritdoc cref="QueryBuilder.ReadWrite()"/>
+    public ref TBuilder ReadWrite();
+
+    /// <inheritdoc cref="QueryBuilder.In()"/>
+    public ref TBuilder In();
+
+    /// <inheritdoc cref="QueryBuilder.Out()"/>
+    public ref TBuilder Out();
+
+    /// <inheritdoc cref="QueryBuilder.InOut()"/>
+    public ref TBuilder InOut();
+
+    /// <inheritdoc cref="QueryBuilder.InOutNone()"/>
+    public ref TBuilder InOutNone();
+
+    /// <inheritdoc cref="QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref TBuilder Oper(ecs_oper_kind_t oper);
+
+    /// <inheritdoc cref="QueryBuilder.And()"/>
+    public ref TBuilder And();
+
+    /// <inheritdoc cref="QueryBuilder.Or()"/>
+    public ref TBuilder Or();
+
+    /// <inheritdoc cref="QueryBuilder.Not()"/>
+    public ref TBuilder Not();
+
+    /// <inheritdoc cref="QueryBuilder.Optional()"/>
+    public ref TBuilder Optional();
+
+    /// <inheritdoc cref="QueryBuilder.AndFrom()"/>
+    public ref TBuilder AndFrom();
+
+    /// <inheritdoc cref="QueryBuilder.OrFrom()"/>
+    public ref TBuilder OrFrom();
+
+    /// <inheritdoc cref="QueryBuilder.NotFrom()"/>
+    public ref TBuilder NotFrom();
+
+    /// <inheritdoc cref="QueryBuilder.Singleton()"/>
+    public ref TBuilder Singleton();
+
+    /// <inheritdoc cref="QueryBuilder.Filter()"/>
+    public ref TBuilder Filter();
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref TBuilder QueryFlags(uint flags);
+
+    /// <inheritdoc cref="QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref TBuilder CacheKind(ecs_query_cache_kind_t kind);
+
+    /// <inheritdoc cref="QueryBuilder.Cached()"/>
+    public ref TBuilder Cached();
+
+    /// <inheritdoc cref="QueryBuilder.Expr(string)"/>
+    public ref TBuilder Expr(string expr);
+
+    /// <inheritdoc cref="QueryBuilder.With(Core.Term)"/>
+    public ref TBuilder With(Term term);
+
+    /// <inheritdoc cref="QueryBuilder.With(ulong)"/>
+    public ref TBuilder With(ulong id);
+
+    /// <inheritdoc cref="QueryBuilder.With(string)"/>
+    public ref TBuilder With(string name);
+
+    /// <inheritdoc cref="QueryBuilder.With(ulong, ulong)"/>
+    public ref TBuilder With(ulong first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.With(ulong, string)"/>
+    public ref TBuilder With(ulong first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.With(string, ulong)"/>
+    public ref TBuilder With(string first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.With(string, string)"/>
+    public ref TBuilder With(string first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.With{T}()"/>
+    public ref TBuilder With<T>();
+
+    /// <inheritdoc cref="QueryBuilder.With{T}(T)"/>
+    public ref TBuilder With<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.With{T1}(ulong)"/>
+    public ref TBuilder With<TFirst>(ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.With{T1}(string)"/>
+    public ref TBuilder With<TFirst>(string second);
+
+    /// <inheritdoc cref="QueryBuilder.With{T1, T2}()"/>
+    public ref TBuilder With<TFirst, TSecond>();
+
+    /// <inheritdoc cref="QueryBuilder.With{T1, T2}(T2)"/>
+    public ref TBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.With{T1, T2}(T1)"/>
+    public ref TBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.With{T1}(T1, string)"/>
+    public ref TBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.With{T2}(string, T2)"/>
+    public ref TBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref TBuilder WithSecond<TSecond>(ulong first);
+
+    /// <inheritdoc cref="QueryBuilder.WithSecond{T2}(string)"/>
+    public ref TBuilder WithSecond<TSecond>(string first);
+
+    /// <inheritdoc cref="QueryBuilder.Without(Core.Term)"/>
+    public ref TBuilder Without(Term term);
+
+    /// <inheritdoc cref="QueryBuilder.Without(ulong)"/>
+    public ref TBuilder Without(ulong id);
+
+    /// <inheritdoc cref="QueryBuilder.Without(string)"/>
+    public ref TBuilder Without(string name);
+
+    /// <inheritdoc cref="QueryBuilder.Without(ulong, ulong)"/>
+    public ref TBuilder Without(ulong first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Without(ulong, string)"/>
+    public ref TBuilder Without(ulong first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.Without(string, ulong)"/>
+    public ref TBuilder Without(string first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Without(string, string)"/>
+    public ref TBuilder Without(string first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.Without{T}()"/>
+    public ref TBuilder Without<T>();
+
+    /// <inheritdoc cref="QueryBuilder.Without{T}(T)"/>
+    public ref TBuilder Without<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Without{T1}(ulong)"/>
+    public ref TBuilder Without<TFirst>(ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Without{T1}(string)"/>
+    public ref TBuilder Without<TFirst>(string second);
+
+    /// <inheritdoc cref="QueryBuilder.Without{T1, T2}()"/>
+    public ref TBuilder Without<TFirst, TSecond>();
+
+    /// <inheritdoc cref="QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref TBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref TBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Without{T1}(T1, string)"/>
+    public ref TBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Without{T2}(string, T2)"/>
+    public ref TBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref TBuilder WithoutSecond<TSecond>(ulong first);
+
+    /// <inheritdoc cref="QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref TBuilder WithoutSecond<TSecond>(string first);
+
+    /// <inheritdoc cref="QueryBuilder.Write(Core.Term)"/>
+    public ref TBuilder Write(Term term);
+
+    /// <inheritdoc cref="QueryBuilder.Write(ulong)"/>
+    public ref TBuilder Write(ulong id);
+
+    /// <inheritdoc cref="QueryBuilder.Write(string)"/>
+    public ref TBuilder Write(string name);
+
+    /// <inheritdoc cref="QueryBuilder.Write(ulong, ulong)"/>
+    public ref TBuilder Write(ulong first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Write(ulong, string)"/>
+    public ref TBuilder Write(ulong first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.Write(string, ulong)"/>
+    public ref TBuilder Write(string first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Write(string, string)"/>
+    public ref TBuilder Write(string first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.Write{T}()"/>
+    public ref TBuilder Write<T>();
+
+    /// <inheritdoc cref="QueryBuilder.Write{T}(T)"/>
+    public ref TBuilder Write<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Write{T1}(ulong)"/>
+    public ref TBuilder Write<TFirst>(ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Write{T1}(string)"/>
+    public ref TBuilder Write<TFirst>(string second);
+
+    /// <inheritdoc cref="QueryBuilder.Write{T1, T2}()"/>
+    public ref TBuilder Write<TFirst, TSecond>();
+
+    /// <inheritdoc cref="QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref TBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref TBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Write{T1}(T1, string)"/>
+    public ref TBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Write{T2}(string, T2)"/>
+    public ref TBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref TBuilder WriteSecond<TSecond>(ulong first);
+
+    /// <inheritdoc cref="QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref TBuilder WriteSecond<TSecond>(string first);
+
+    /// <inheritdoc cref="QueryBuilder.Read(Core.Term)"/>
+    public ref TBuilder Read(Term term);
+
+    /// <inheritdoc cref="QueryBuilder.Read(ulong)"/>
+    public ref TBuilder Read(ulong id);
+
+    /// <inheritdoc cref="QueryBuilder.Read(string)"/>
+    public ref TBuilder Read(string name);
+
+    /// <inheritdoc cref="QueryBuilder.Read(ulong, ulong)"/>
+    public ref TBuilder Read(ulong first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Read(ulong, string)"/>
+    public ref TBuilder Read(ulong first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.Read(string, ulong)"/>
+    public ref TBuilder Read(string first, ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Read(string, string)"/>
+    public ref TBuilder Read(string first, string second);
+
+    /// <inheritdoc cref="QueryBuilder.Read{T}()"/>
+    public ref TBuilder Read<T>();
+
+    /// <inheritdoc cref="QueryBuilder.Read{T}(T)"/>
+    public ref TBuilder Read<T>(T value) where T : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Read{T1}(ulong)"/>
+    public ref TBuilder Read<TFirst>(ulong second);
+
+    /// <inheritdoc cref="QueryBuilder.Read{T1}(string)"/>
+    public ref TBuilder Read<TFirst>(string second);
+
+    /// <inheritdoc cref="QueryBuilder.Read{T1, T2}()"/>
+    public ref TBuilder Read<TFirst, TSecond>();
+
+    /// <inheritdoc cref="QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref TBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref TBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Read{T1}(T1, string)"/>
+    public ref TBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.Read{T2}(string, T2)"/>
+    public ref TBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum;
+
+    /// <inheritdoc cref="QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref TBuilder ReadSecond<TSecond>(ulong first);
+
+    /// <inheritdoc cref="QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref TBuilder ReadSecond<TSecond>(string first);
+
+    /// <inheritdoc cref="QueryBuilder.ScopeOpen()"/>
+    public ref TBuilder ScopeOpen();
+
+    /// <inheritdoc cref="QueryBuilder.ScopeClose()"/>
+    public ref TBuilder ScopeClose();
+
+    /// <inheritdoc cref="QueryBuilder.Term()"/>
+    public ref TBuilder Term();
+
+    /// <inheritdoc cref="QueryBuilder.TermAt(int)"/>
+    public ref TBuilder TermAt(int termIndex);
+
+    /// <inheritdoc cref="QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref TBuilder OrderBy(ulong component, Ecs.OrderByCallback callback);
+
+    /// <inheritdoc cref="QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref TBuilder OrderBy<T>(Ecs.OrderByCallback callback);
+
+    /// <inheritdoc cref="QueryBuilder.GroupBy(ulong)"/>
+    public ref TBuilder GroupBy(ulong component);
+
+    /// <inheritdoc cref="QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref TBuilder GroupBy(ulong component, Ecs.GroupByCallback callback);
+
+    /// <inheritdoc cref="QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref TBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback);
+
+    /// <inheritdoc cref="QueryBuilder.GroupBy{T}()"/>
+    public ref TBuilder GroupBy<T>();
+
+    /// <inheritdoc cref="QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref TBuilder GroupBy<T>(Ecs.GroupByCallback callback);
+
+    /// <inheritdoc cref="QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref TBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback);
+
+    /// <inheritdoc cref="QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref TBuilder GroupByCtx<T>(T value);
+
+    /// <inheritdoc cref="QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref TBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback);
+
+    /// <inheritdoc cref="QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref TBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback);
+
+    /// <inheritdoc cref="QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref TBuilder OnGroupCreate(Ecs.GroupCreateCallback callback);
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref TBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback);
+
+    /// <inheritdoc cref="QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref TBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback);
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref TBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback);
+
+    public ref TBuilder DetectChanges();
+}
diff --git a/src/Flecs.NET/Core/Iter.cs b/src/Flecs.NET/Core/Iter.cs
index 92b383c2..59fb239e 100644
--- a/src/Flecs.NET/Core/Iter.cs
+++ b/src/Flecs.NET/Core/Iter.cs
@@ -1,871 +1,872 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Flecs.NET.Core.BindingContext;
-using Flecs.NET.Utilities;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-/// <summary>
-///     Class for iterating over query results.
-/// </summary>
-public unsafe partial struct Iter : IEnumerable<int>, IEquatable<Iter>, IDisposable
-{
-    private ecs_iter_t* _handle;
-
-    /// <summary>
-    ///     Reference to handle.
-    /// </summary>
-    public ref ecs_iter_t* Handle => ref _handle;
-
-    /// <summary>
-    ///     Creates an iter wrapper using the provided handle.
-    /// </summary>
-    /// <param name="iter"></param>
-    public Iter(ecs_iter_t* iter)
-    {
-        _handle = iter;
-    }
-
-    /// <summary>
-    ///     Free iterator resources.
-    /// </summary>
-    public void Dispose()
-    {
-        Fini();
-    }
-
-    /// <summary>
-    ///     Returns entity id of system.
-    /// </summary>
-    /// <returns></returns>
-    public Entity System()
-    {
-        return new Entity(Handle->world, Handle->system);
-    }
-
-    /// <summary>
-    ///     Returns entity id of event.
-    /// </summary>
-    /// <returns></returns>
-    public Entity Event()
-    {
-        return new Entity(Handle->world, Handle->@event);
-    }
-
-    /// <summary>
-    ///     Returns the entity id of the event id.
-    /// </summary>
-    /// <returns></returns>
-    public Id EventId()
-    {
-        return new Id(Handle->world, Handle->event_id);
-    }
-
-    /// <summary>
-    ///     Returns staged C# world.
-    /// </summary>
-    /// <returns></returns>
-    public World World()
-    {
-        return new World(Handle->world);
-    }
-
-    /// <summary>
-    ///     Returns the number of entities to iterate.
-    /// </summary>
-    /// <returns>Number of entities to iterate.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public int Count()
-    {
-        return Handle->count;
-    }
-
-    /// <summary>
-    ///     Returns the time elapsed since last frame.
-    /// </summary>
-    /// <returns>Time elapsed since last frame</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public float DeltaTime()
-    {
-        return Handle->delta_time;
-    }
-
-    /// <summary>
-    ///     Returns the time elapsed since last system invocation.
-    /// </summary>
-    /// <returns>Time elapsed since last system invocation.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public float DeltaSystemTime()
-    {
-        return Handle->delta_system_time;
-    }
-
-    /// <summary>
-    ///     Returns the type of the iterated table.
-    /// </summary>
-    /// <returns></returns>
-    public FlecsType Type()
-    {
-        return new FlecsType(Handle->world, ecs_table_get_type(Handle->table));
-    }
-
-    /// <summary>
-    ///     Returns the table of the iter.
-    /// </summary>
-    /// <returns></returns>
-    public Table Table()
-    {
-        return new Table(Handle->real_world, Handle->table);
-    }
-
-    /// <summary>
-    ///     Returns the other table of the iter.
-    /// </summary>
-    /// <returns></returns>
-    public Table OtherTable()
-    {
-        return new Table(Handle->real_world, Handle->other_table);
-    }
-
-    /// <summary>
-    ///     Returns table range of the iter.
-    /// </summary>
-    /// <returns></returns>
-    public Table Range()
-    {
-        return new Table(Handle->real_world, Handle->table, Handle->offset, Handle->count);
-    }
-
-    /// <summary>
-    ///     Returns context pointer.
-    /// </summary>
-    /// <returns></returns>
-    public void* CtxPtr()
-    {
-        return Handle->ctx;
-    }
-
-    /// <summary>
-    ///     Returns context pointer.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* CtxPtr<T>() where T : unmanaged
-    {
-        return (T*)Handle->ctx;
-    }
-
-    /// <summary>
-    ///     Returns context ref.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref T Ctx<T>()
-    {
-        UserContext* context = (UserContext*)Handle->ctx;
-        return ref context->Get<T>();
-    }
-
-    /// <summary>
-    ///     Returns param pointer.
-    /// </summary>
-    /// <returns></returns>
-    public void* ParamPtr()
-    {
-        return Handle->param;
-    }
-
-    /// <summary>
-    ///     Returns param pointer.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* ParamPtr<T>() where T : unmanaged
-    {
-        return (T*)Handle->param;
-    }
-
-    /// <summary>
-    ///     Returns param ref.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref T Param<T>() where T : unmanaged
-    {
-        return ref *ParamPtr<T>();
-    }
-
-    /// <summary>
-    ///     Obtain mutable handle to entity being iterated over.
-    /// </summary>
-    /// <param name="row"></param>
-    /// <returns></returns>
-    public Entity Entity(int row)
-    {
-        Ecs.Assert(row < Handle->count, nameof(ECS_COLUMN_INDEX_OUT_OF_RANGE));
-        return new Entity(Handle->world, Handle->entities[row]);
-    }
-
-    /// <summary>
-    ///     Returns whether field is matched on self.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public bool IsSelf(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        return ecs_field_is_self(Handle, (byte)index);
-    }
-
-    /// <summary>
-    ///     Returns whether field is set.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public bool IsSet(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        return ecs_field_is_set(Handle, (byte)index);
-    }
-
-    /// <summary>
-    ///     Returns whether field is readonly.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public bool IsReadonly(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        return ecs_field_is_readonly(Handle, (byte)index);
-    }
-
-    /// <summary>
-    ///     Number of fields in iterator.
-    /// </summary>
-    /// <returns></returns>
-    public int FieldCount()
-    {
-        return Handle->field_count;
-    }
-
-    /// <summary>
-    ///     Size of field data type.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public ulong Size(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        return (ulong)ecs_field_size(Handle, (byte)index);
-    }
-
-    /// <summary>
-    ///     Obtain field source (0 if This).
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public Entity Src(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        return new Entity(Handle->world, ecs_field_src(Handle, (byte)index));
-    }
-
-    /// <summary>
-    ///     Obtain id matched for field.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public Id Id(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        return new Id(Handle->world, ecs_field_id(Handle, (byte)index));
-    }
-
-    /// <summary>
-    ///     Obtain pair id matched for field.
-    ///     This operation will fail if the id is not a pair.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public Id Pair(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        ulong id = ecs_field_id(Handle, (byte)index);
-        Ecs.Assert(Ecs.EntityHasIdFlag(id, ECS_PAIR) != 0, nameof(ECS_INVALID_PARAMETER));
-        return new Id(Handle->world, id);
-    }
-
-    /// <summary>
-    ///     Obtain column index for field.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public int ColumnIndex(int index)
-    {
-        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
-        return ecs_field_column(Handle, (byte)index);
-    }
-
-    /// <summary>
-    ///     Convert current iterator result to string.
-    /// </summary>
-    /// <returns></returns>
-    public string Str()
-    {
-        return NativeString.GetStringAndFree(ecs_iter_str(Handle));
-    }
-
-    /// <summary>
-    ///     Retrieves an untyped field at the provided index.
-    /// </summary>
-    /// <param name="index">The field index.</param>
-    /// <returns></returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public UntypedField Field(int index)
-    {
-        return GetUntypedField(index);
-    }
-
-    /// <summary>
-    ///     Retrieves a pointer to untyped field at row.
-    /// </summary>
-    /// <param name="index">The field index.</param>
-    /// <param name="row">The field row.</param>
-    /// <returns></returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void* FieldAt(int index, int row)
-    {
-        return Utils.IsBitSet(Handle->row_fields, index)
-            ? GetUntypedFieldAt(index, row)[0]
-            : GetUntypedField(index)[row];
-    }
-
-    /// <summary>
-    ///     Retrieves a field at the provided index.
-    /// </summary>
-    /// <param name="index">The field index.</param>
-    /// <typeparam name="T">The field type.</typeparam>
-    /// <returns></returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Field<T> Field<T>(int index)
-    {
-        return GetField<T>(index);
-    }
-
-    /// <summary>
-    ///     Retrieves a managed reference to field at row.
-    /// </summary>
-    /// <param name="index">The field index.</param>
-    /// <param name="row">The field row.</param>
-    /// <typeparam name="T">The field type.</typeparam>
-    /// <returns></returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public ref T FieldAt<T>(int index, int row)
-    {
-        return ref Utils.IsBitSet(Handle->row_fields, index)
-            ? ref GetFieldAt<T>(index, row)[0]
-            : ref GetField<T>(index)[row];
-    }
-
-    /// <summary>
-    ///     Get access to entity ids.
-    /// </summary>
-    /// <returns></returns>
-    public Field<ulong> Entities()
-    {
-        return new Field<ulong>(Handle->entities, Handle->count);
-    }
-
-    /// <summary>
-    ///     Check if the current table has changed since the last iteration.
-    ///     Can only be used when iterating queries and/or systems.
-    /// </summary>
-    /// <returns></returns>
-    public bool Changed()
-    {
-        return ecs_iter_changed(Handle);
-    }
-
-    /// <summary>
-    ///     Skip current table.
-    ///     This indicates to the query that the data in the current table is not
-    ///     modified. By default, iterating a table with a query will mark the
-    ///     iterated components as dirty if they are annotated with InOut or Out.
-    /// </summary>
-    public void Skip()
-    {
-        ecs_iter_skip(Handle);
-    }
-
-    /// <summary>
-    ///     Return group id for current table (grouped queries only)
-    /// </summary>
-    /// <returns></returns>
-    public ulong GroupId()
-    {
-        return Handle->group_id;
-    }
-
-    /// <summary>
-    ///     Get value of variable by id.
-    /// </summary>
-    /// <param name="varId"></param>
-    /// <returns></returns>
-    public Entity GetVar(int varId)
-    {
-        Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
-        return new Entity(Handle->world, ecs_iter_get_var(Handle, varId));
-    }
-
-    /// <summary>
-    ///     Get value of variable by name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public Entity GetVar(string name)
-    {
-        ecs_query_t* query = Handle->query;
-
-        using NativeString nativeName = (NativeString)name;
-        int varId = ecs_query_find_var(query, nativeName);
-        Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
-
-        return new Entity(Handle->world, ecs_iter_get_var(Handle, varId));
-    }
-
-    /// <summary>
-    ///     Iterate targets for pair field.
-    /// </summary>
-    /// <param name="index">The field index.</param>
-    /// <param name="callback">The callback.</param>
-    public void Targets(int index, Ecs.EachEntityCallback callback)
-    {
-        Ecs.Assert(Handle->table != null, nameof(ECS_INVALID_OPERATION));
-        Ecs.Assert(index < Handle->field_count,  nameof(ECS_INVALID_PARAMETER));
-        Ecs.Assert(ecs_field_is_set(Handle, (byte)index),  nameof(ECS_INVALID_PARAMETER));
-
-        ecs_type_t* tableType = ecs_table_get_type(Handle->table);
-        ecs_table_record_t *tr = Handle->trs[index];
-
-        int end = tr->index + tr->count;
-        for (int i = tr->index; i < end; i++)
-        {
-            ulong id = tableType->array[i];
-            Ecs.Assert(Ecs.IsPair(id), "Field must be a pair.");
-            callback(new Entity(Handle->world, Ecs.PairSecond(Handle->real_world, id)));
-        }
-    }
-
-    /// <summary>
-    ///     Iterate targets for pair field.
-    /// </summary>
-    /// <param name="index">The field index.</param>
-    /// <param name="callback">The callback.</param>
-    public void Targets(int index, delegate*<Entity, void> callback)
-    {
-        Ecs.Assert(Handle->table != null, nameof(ECS_INVALID_OPERATION));
-        Ecs.Assert(index < Handle->field_count,  nameof(ECS_INVALID_PARAMETER));
-        Ecs.Assert(ecs_field_is_set(Handle, (byte)index),  nameof(ECS_INVALID_PARAMETER));
-
-        ecs_type_t* tableType = ecs_table_get_type(Handle->table);
-        ecs_table_record_t *tr = Handle->trs[index];
-
-        int end = tr->index + tr->count;
-        for (int i = tr->index; i < end; i++)
-        {
-            ulong id = tableType->array[i];
-            Ecs.Assert(Ecs.IsPair(id), "Field must be a pair.");
-            callback(new Entity(Handle->world, Ecs.PairSecond(Handle->real_world, id)));
-        }
-    }
-
-    /// <summary>
-    ///     Progress iterator.
-    /// </summary>
-    /// <returns>The result.</returns>
-    public bool Next()
-    {
-        if ((Handle->flags & EcsIterIsValid) != 0 && Handle->table != null)
-            Ecs.TableUnlock(Handle->world, Handle->table);
-
-        bool result = ((delegate* unmanaged<ecs_iter_t*, byte>)Handle->next)(Handle) != 0;
-
-        Handle->flags |= EcsIterIsValid;
-
-        if (result && Handle->table != null)
-            Ecs.TableLock(Handle->world, Handle->table);
-
-        return result;
-    }
-
-    /// <summary>
-    ///     Forward to Each callback.
-    /// </summary>
-    public void Each()
-    {
-        Callback();
-    }
-
-    /// <summary>
-    ///     Forward to callback.
-    /// </summary>
-    public void Callback()
-    {
-        Ecs.Assert(Handle->callback != default, "Iter/Each callback is not set.");
-        ((delegate* unmanaged<ecs_iter_t*, void>)Handle->callback)(Handle);
-    }
-
-    /// <summary>
-    ///     Free iterator resources.
-    /// </summary>
-    public void Fini()
-    {
-        if (Handle == null)
-            return;
-
-        if ((Handle->flags & EcsIterIsValid) != 0 && Handle->table != null)
-            Ecs.TableUnlock(Handle->world, Handle->table);
-
-        ecs_iter_fini(Handle);
-        Handle = null;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal UntypedField GetUntypedField(int index)
-    {
-        return new UntypedField(
-            ecs_field_w_size(Handle, 0, (byte)index),
-            (int)ecs_field_size(Handle, (byte)index),
-            ecs_field_is_self(Handle, (byte)index) ? Handle->count : 1
-        );
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal UntypedField GetUntypedFieldAt(int index, int row)
-    {
-        return new UntypedField(
-            ecs_field_at_w_size(Handle, 0, (byte)index, row),
-            (int)ecs_field_size(Handle, (byte)index),
-            1
-        );
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal Field<T> GetField<T>(int index)
-    {
-        AssertField<T>(Handle, index);
-        UntypedField field = GetUntypedField(index);
-        return new Field<T>(field.Data, field.Length);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal Field<T> GetFieldAt<T>(int index, int row)
-    {
-        AssertField<T>(Handle, index);
-        UntypedField field = GetUntypedFieldAt(index, row);
-        return new Field<T>(field.Data, 1);
-    }
-
-    [Conditional("DEBUG")]
-    internal static void AssertField<T>(ecs_iter_t* iter, int index)
-    {
-        Ecs.Assert(index >= 0 && index < iter->field_count, "Field index out of range.");
-
-        if (ecs_id_is_tag(iter->world, iter->ids[index]) || ecs_id_is_wildcard(iter->ids[index]))
-        {
-            Ecs.Error($$"""
-                Invalid type argument "{{new Entity(iter->world, iter->ids[index])}}" at field index {{index}}. Component data cannot be retrieved for tag types.
-                [Query Name]: {{new Entity(iter->world, iter->system)}}
-                [Query Fields]: {{new Query(iter->query).Str()}}
-                """
-            );
-        }
-
-        if (Ecs.TypeIdIs<T>(iter->world, iter->ids[index]))
-            return;
-
-        Ecs.Error($$"""
-            Type argument mismatch at field index {{index}}.
-            [Query Name]: {{new Entity(iter->world, iter->system)}}
-            [Query Fields]: {{new Query(iter->query).Str()}}
-            [Expected Type]: {{new Entity(iter->world, iter->ids[index])}}
-            [Provided Type]: {{new Entity(iter->world, Type<T>.Id(iter->world))}}
-            """
-        );
-    }
-
-    /// <summary>
-    ///     Gets an enumerator for iter.
-    /// </summary>
-    /// <returns></returns>
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-        return GetEnumerator();
-    }
-
-    IEnumerator<int> IEnumerable<int>.GetEnumerator()
-    {
-        return GetEnumerator();
-    }
-
-    /// <summary>
-    ///     Gets an enumerator for iter.
-    /// </summary>
-    /// <returns></returns>
-    public IterEnumerator GetEnumerator()
-    {
-        return new IterEnumerator(Handle->count);
-    }
-
-    /// <summary>
-    ///     Converts a <see cref="Iter"/> instance to a <see cref="ecs_iter_t"/>*.
-    /// </summary>
-    /// <param name="iter"></param>
-    /// <returns></returns>
-    public static ecs_iter_t* To(Iter iter)
-    {
-        return iter.Handle;
-    }
-
-    /// <summary>
-    ///     Converts a <see cref="ecs_iter_t"/>* instance to a <see cref="Iter"/>.
-    /// </summary>
-    /// <param name="iter"></param>
-    /// <returns></returns>
-    public static Iter From(ecs_iter_t* iter)
-    {
-        return new Iter(iter);
-    }
-
-    /// <summary>
-    ///     Converts a <see cref="Iter"/> instance to a <see cref="ecs_iter_t"/>*.
-    /// </summary>
-    /// <param name="iter"></param>
-    /// <returns></returns>
-    public static implicit operator ecs_iter_t*(Iter iter)
-    {
-        return To(iter);
-    }
-
-    /// <summary>
-    ///     Converts a <see cref="ecs_iter_t"/>* instance to a <see cref="Iter"/>.
-    /// </summary>
-    /// <param name="iter"></param>
-    /// <returns></returns>
-    public static implicit operator Iter(ecs_iter_t* iter)
-    {
-        return From(iter);
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Iter"/> instances are equal.
-    /// </summary>
-    /// <param name="other"></param>
-    /// <returns></returns>
-    public bool Equals(Iter other)
-    {
-        return Handle == other.Handle;
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Iter"/> instances are equal.
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    public override bool Equals(object? obj)
-    {
-        return obj is Iter other && Equals(other);
-    }
-
-    /// <summary>
-    ///     Returns the hash code of te <see cref="Iter"/>.
-    /// </summary>
-    /// <returns></returns>
-    public override int GetHashCode()
-    {
-        return Handle->GetHashCode();
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Iter"/> instances are equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator ==(Iter left, Iter right)
-    {
-        return left.Equals(right);
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="Iter"/> instances are not equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator !=(Iter left, Iter right)
-    {
-        return !(left == right);
-    }
-}
-
-// Flecs.NET Extensions
-public unsafe partial struct Iter
-{
-    /// <summary>
-    ///     Returns the query being evaluated.
-    /// </summary>
-    /// <returns>The query.</returns>
-    public Query Query()
-    {
-        return new Query(Handle->query);
-    }
-
-    /// <summary>
-    ///     Get managed ref to the first element in a field.
-    /// </summary>
-    /// <param name="index">The index of the field in the iterator.</param>
-    /// <typeparam name="T">The field type.</typeparam>
-    /// <returns>Reference to first component of field.</returns>
-    [SuppressMessage("Usage", "CA1720")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public ref T Single<T>(int index)
-    {
-        return ref GetField<T>(index)[0];
-    }
-
-    /// <summary>
-    ///     Obtain span for a query field.
-    /// </summary>
-    /// <param name="index">The index of the field in the iterator.</param>
-    /// <typeparam name="T">The field type.</typeparam>
-    /// <returns>A span to the data of the field.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Span<T> Span<T>(int index) where T : unmanaged
-    {
-        return GetSpan<T>(index);
-    }
-
-    /// <summary>
-    ///     Obtain pointer to a query field.
-    /// </summary>
-    /// <param name="index">The index of the field in the iterator.</param>
-    /// <typeparam name="T">The field type.</typeparam>
-    /// <returns>A pointer to the data of the field.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public T* Pointer<T>(int index) where T : unmanaged
-    {
-        return GetPointer<T>(index);
-    }
-
-    /// <summary>
-    ///     Get pointer to field at row.
-    /// </summary>
-    /// <param name="index">The index of the field in the iterator.</param>
-    /// <param name="row">The row.</param>
-    /// <typeparam name="T">The field type.</typeparam>
-    /// <returns>A pointer to the data of the field.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public T* PointerAt<T>(int index, int row) where T : unmanaged
-    {
-        return &Pointer<T>(index)[row];
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal Span<T> GetSpan<T>(int index)
-    {
-        Field<T> field = GetField<T>(index);
-        return new Span<T>(field.Data, field.Length);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal T* GetPointer<T>(int index)
-    {
-        AssertField<T>(Handle, index);
-        return (T*)ecs_field_w_size(Handle, Type<T>.Size, (byte)index);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal FieldData<T> GetFieldData<T>(byte index)
-    {
-        AssertField<T>(Handle, index);
-        return new FieldData<T>(Handle, index);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal IterationTechnique GetIterationTechnique(int fieldCount)
-    {
-        IterationTechnique flags = default;
-
-        int mask = (1 << fieldCount) - 1;
-
-        if ((Handle->row_fields & mask) != 0)
-            flags |= IterationTechnique.Sparse;
-
-        if (((Handle->ref_fields & mask) != 0 && Handle->ref_fields != Handle->row_fields) || (Handle->up_fields & mask) != 0 || (Handle->set_fields & mask) != mask)
-            flags |= IterationTechnique.Shared;
-
-        return flags;
-    }
-}
-
-/// <summary>
-///     Enumerator for iters.
-/// </summary>
-public struct IterEnumerator : IEnumerator<int>
-{
-    /// <summary>
-    ///     Length of the iter.
-    /// </summary>
-    public int Length { get; }
-
-    /// <summary>
-    ///     Current index of the iter.
-    /// </summary>
-    public int Current { get; private set; }
-
-    /// <summary>
-    ///     Current index of the iter.
-    /// </summary>
-    readonly object IEnumerator.Current => Current;
-
-    /// <summary>
-    ///     Create a new iter with the provided length.
-    /// </summary>
-    /// <param name="length"></param>
-    public IterEnumerator(int length)
-    {
-        Length = length;
-        Current = -1;
-    }
-
-    /// <summary>
-    ///     Moves to the next index of the iter.
-    /// </summary>
-    /// <returns></returns>
-    public bool MoveNext()
-    {
-        Current++;
-        return Current < Length;
-    }
-
-    /// <summary>
-    ///     Resets the index of the enumerator.
-    /// </summary>
-    public void Reset()
-    {
-        Current = -1;
-    }
-
-    /// <summary>
-    ///     Disposes of resources.
-    /// </summary>
-    public void Dispose()
-    {
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using Flecs.NET.Core.BindingContext;
+using Flecs.NET.Utilities;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+/// <summary>
+///     Class for iterating over query results.
+/// </summary>
+public unsafe partial struct Iter : IEnumerable<int>, IEquatable<Iter>, IDisposable
+{
+    private ecs_iter_t* _handle;
+
+    /// <summary>
+    ///     Reference to handle.
+    /// </summary>
+    public ref ecs_iter_t* Handle => ref _handle;
+
+    /// <summary>
+    ///     Creates an iter wrapper using the provided handle.
+    /// </summary>
+    /// <param name="iter"></param>
+    public Iter(ecs_iter_t* iter)
+    {
+        _handle = iter;
+    }
+
+    /// <summary>
+    ///     Free iterator resources.
+    /// </summary>
+    public void Dispose()
+    {
+        Fini();
+    }
+
+    /// <summary>
+    ///     Returns entity id of system.
+    /// </summary>
+    /// <returns></returns>
+    public Entity System()
+    {
+        return new Entity(Handle->world, Handle->system);
+    }
+
+    /// <summary>
+    ///     Returns entity id of event.
+    /// </summary>
+    /// <returns></returns>
+    public Entity Event()
+    {
+        return new Entity(Handle->world, Handle->@event);
+    }
+
+    /// <summary>
+    ///     Returns the entity id of the event id.
+    /// </summary>
+    /// <returns></returns>
+    public Id EventId()
+    {
+        return new Id(Handle->world, Handle->event_id);
+    }
+
+    /// <summary>
+    ///     Returns staged C# world.
+    /// </summary>
+    /// <returns></returns>
+    public World World()
+    {
+        return new World(Handle->world);
+    }
+
+    /// <summary>
+    ///     Returns the number of entities to iterate.
+    /// </summary>
+    /// <returns>Number of entities to iterate.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int Count()
+    {
+        return Handle->count;
+    }
+
+    /// <summary>
+    ///     Returns the time elapsed since last frame.
+    /// </summary>
+    /// <returns>Time elapsed since last frame</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public float DeltaTime()
+    {
+        return Handle->delta_time;
+    }
+
+    /// <summary>
+    ///     Returns the time elapsed since last system invocation.
+    /// </summary>
+    /// <returns>Time elapsed since last system invocation.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public float DeltaSystemTime()
+    {
+        return Handle->delta_system_time;
+    }
+
+    /// <summary>
+    ///     Returns the type of the iterated table.
+    /// </summary>
+    /// <returns></returns>
+    public FlecsType Type()
+    {
+        return new FlecsType(Handle->world, ecs_table_get_type(Handle->table));
+    }
+
+    /// <summary>
+    ///     Returns the table of the iter.
+    /// </summary>
+    /// <returns></returns>
+    public Table Table()
+    {
+        return new Table(Handle->real_world, Handle->table);
+    }
+
+    /// <summary>
+    ///     Returns the other table of the iter.
+    /// </summary>
+    /// <returns></returns>
+    public Table OtherTable()
+    {
+        return new Table(Handle->real_world, Handle->other_table);
+    }
+
+    /// <summary>
+    ///     Returns table range of the iter.
+    /// </summary>
+    /// <returns></returns>
+    public Table Range()
+    {
+        return new Table(Handle->real_world, Handle->table, Handle->offset, Handle->count);
+    }
+
+    /// <summary>
+    ///     Returns context pointer.
+    /// </summary>
+    /// <returns></returns>
+    public void* CtxPtr()
+    {
+        return Handle->ctx;
+    }
+
+    /// <summary>
+    ///     Returns context pointer.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* CtxPtr<T>() where T : unmanaged
+    {
+        return (T*)Handle->ctx;
+    }
+
+    /// <summary>
+    ///     Returns context ref.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref T Ctx<T>()
+    {
+        UserContext* context = (UserContext*)Handle->ctx;
+        return ref context->Get<T>();
+    }
+
+    /// <summary>
+    ///     Returns param pointer.
+    /// </summary>
+    /// <returns></returns>
+    public void* ParamPtr()
+    {
+        return Handle->param;
+    }
+
+    /// <summary>
+    ///     Returns param pointer.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* ParamPtr<T>() where T : unmanaged
+    {
+        return (T*)Handle->param;
+    }
+
+    /// <summary>
+    ///     Returns param ref.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref T Param<T>() where T : unmanaged
+    {
+        return ref *ParamPtr<T>();
+    }
+
+    /// <summary>
+    ///     Obtain mutable handle to entity being iterated over.
+    /// </summary>
+    /// <param name="row"></param>
+    /// <returns></returns>
+    public Entity Entity(int row)
+    {
+        Ecs.Assert(row < Handle->count, nameof(ECS_COLUMN_INDEX_OUT_OF_RANGE));
+        return new Entity(Handle->world, Handle->entities[row]);
+    }
+
+    /// <summary>
+    ///     Returns whether field is matched on self.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public bool IsSelf(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        return ecs_field_is_self(Handle, (byte)index);
+    }
+
+    /// <summary>
+    ///     Returns whether field is set.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public bool IsSet(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        return ecs_field_is_set(Handle, (byte)index);
+    }
+
+    /// <summary>
+    ///     Returns whether field is readonly.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public bool IsReadonly(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        return ecs_field_is_readonly(Handle, (byte)index);
+    }
+
+    /// <summary>
+    ///     Number of fields in iterator.
+    /// </summary>
+    /// <returns></returns>
+    public int FieldCount()
+    {
+        return Handle->field_count;
+    }
+
+    /// <summary>
+    ///     Size of field data type.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public ulong Size(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        return (ulong)ecs_field_size(Handle, (byte)index);
+    }
+
+    /// <summary>
+    ///     Obtain field source (0 if This).
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public Entity Src(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        return new Entity(Handle->world, ecs_field_src(Handle, (byte)index));
+    }
+
+    /// <summary>
+    ///     Obtain id matched for field.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public Id Id(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        return new Id(Handle->world, ecs_field_id(Handle, (byte)index));
+    }
+
+    /// <summary>
+    ///     Obtain pair id matched for field.
+    ///     This operation will fail if the id is not a pair.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public Id Pair(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        ulong id = ecs_field_id(Handle, (byte)index);
+        Ecs.Assert(Ecs.EntityHasIdFlag(id, ECS_PAIR) != 0, nameof(ECS_INVALID_PARAMETER));
+        return new Id(Handle->world, id);
+    }
+
+    /// <summary>
+    ///     Obtain column index for field.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public int ColumnIndex(int index)
+    {
+        Ecs.Assert(index < Handle->field_count, "Field index out of range.");
+        return ecs_field_column(Handle, (byte)index);
+    }
+
+    /// <summary>
+    ///     Convert current iterator result to string.
+    /// </summary>
+    /// <returns></returns>
+    public string Str()
+    {
+        return NativeString.GetStringAndFree(ecs_iter_str(Handle));
+    }
+
+    /// <summary>
+    ///     Retrieves an untyped field at the provided index.
+    /// </summary>
+    /// <param name="index">The field index.</param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public UntypedField Field(int index)
+    {
+        return GetUntypedField(index);
+    }
+
+    /// <summary>
+    ///     Retrieves a pointer to untyped field at row.
+    /// </summary>
+    /// <param name="index">The field index.</param>
+    /// <param name="row">The field row.</param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void* FieldAt(int index, int row)
+    {
+        return Utils.IsBitSet(Handle->row_fields, index)
+            ? GetUntypedFieldAt(index, row)[0]
+            : GetUntypedField(index)[row];
+    }
+
+    /// <summary>
+    ///     Retrieves a field at the provided index.
+    /// </summary>
+    /// <param name="index">The field index.</param>
+    /// <typeparam name="T">The field type.</typeparam>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public Field<T> Field<T>(int index)
+    {
+        return GetField<T>(index);
+    }
+
+    /// <summary>
+    ///     Retrieves a managed reference to field at row.
+    /// </summary>
+    /// <param name="index">The field index.</param>
+    /// <param name="row">The field row.</param>
+    /// <typeparam name="T">The field type.</typeparam>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref T FieldAt<T>(int index, int row)
+    {
+        return ref Utils.IsBitSet(Handle->row_fields, index)
+            ? ref GetFieldAt<T>(index, row)[0]
+            : ref GetField<T>(index)[row];
+    }
+
+    /// <summary>
+    ///     Get access to entity ids.
+    /// </summary>
+    /// <returns></returns>
+    public Field<ulong> Entities()
+    {
+        return new Field<ulong>(Handle->entities, Handle->count);
+    }
+
+    /// <summary>
+    ///     Check if the current table has changed since the last iteration.
+    ///     Can only be used when iterating queries and/or systems.
+    /// </summary>
+    /// <returns></returns>
+    public bool Changed()
+    {
+        return ecs_iter_changed(Handle);
+    }
+
+    /// <summary>
+    ///     Skip current table.
+    ///     This indicates to the query that the data in the current table is not
+    ///     modified. By default, iterating a table with a query will mark the
+    ///     iterated components as dirty if they are annotated with InOut or Out.
+    /// </summary>
+    public void Skip()
+    {
+        ecs_iter_skip(Handle);
+    }
+
+    /// <summary>
+    ///     Return group id for current table (grouped queries only)
+    /// </summary>
+    /// <returns></returns>
+    public ulong GroupId()
+    {
+        return ecs_iter_get_group(Handle);
+    }
+
+    /// <summary>
+    ///     Get value of variable by id.
+    /// </summary>
+    /// <param name="varId"></param>
+    /// <returns></returns>
+    public Entity GetVar(int varId)
+    {
+        Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
+        return new Entity(Handle->world, ecs_iter_get_var(Handle, varId));
+    }
+
+    /// <summary>
+    ///     Get value of variable by name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public Entity GetVar(string name)
+    {
+        ecs_query_t* query = Handle->query;
+
+        using NativeString nativeName = (NativeString)name;
+        int varId = ecs_query_find_var(query, nativeName);
+        Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
+
+        return new Entity(Handle->world, ecs_iter_get_var(Handle, varId));
+    }
+
+    /// <summary>
+    ///     Iterate targets for pair field.
+    /// </summary>
+    /// <param name="index">The field index.</param>
+    /// <param name="callback">The callback.</param>
+    public void Targets(int index, Ecs.EachEntityCallback callback)
+    {
+        Ecs.Assert(Handle->table != null, nameof(ECS_INVALID_OPERATION));
+        Ecs.Assert(index < Handle->field_count,  nameof(ECS_INVALID_PARAMETER));
+        Ecs.Assert(ecs_field_is_set(Handle, (byte)index),  nameof(ECS_INVALID_PARAMETER));
+
+        ecs_type_t* tableType = ecs_table_get_type(Handle->table);
+        ecs_table_record_t *tr = Handle->trs[index];
+
+        int end = tr->index + tr->count;
+        for (int i = tr->index; i < end; i++)
+        {
+            ulong id = tableType->array[i];
+            Ecs.Assert(Ecs.IsPair(id), "Field must be a pair.");
+            callback(new Entity(Handle->world, Ecs.PairSecond(Handle->real_world, id)));
+        }
+    }
+
+    /// <summary>
+    ///     Iterate targets for pair field.
+    /// </summary>
+    /// <param name="index">The field index.</param>
+    /// <param name="callback">The callback.</param>
+    public void Targets(int index, delegate*<Entity, void> callback)
+    {
+        Ecs.Assert(Handle->table != null, nameof(ECS_INVALID_OPERATION));
+        Ecs.Assert(index < Handle->field_count,  nameof(ECS_INVALID_PARAMETER));
+        Ecs.Assert(ecs_field_is_set(Handle, (byte)index),  nameof(ECS_INVALID_PARAMETER));
+
+        ecs_type_t* tableType = ecs_table_get_type(Handle->table);
+        ecs_table_record_t *tr = Handle->trs[index];
+
+        int end = tr->index + tr->count;
+        for (int i = tr->index; i < end; i++)
+        {
+            ulong id = tableType->array[i];
+            Ecs.Assert(Ecs.IsPair(id), "Field must be a pair.");
+            callback(new Entity(Handle->world, Ecs.PairSecond(Handle->real_world, id)));
+        }
+    }
+
+    /// <summary>
+    ///     Progress iterator.
+    /// </summary>
+    /// <returns>The result.</returns>
+    public bool Next()
+    {
+        if ((Handle->flags & EcsIterIsValid) != 0 && Handle->table != null)
+            Ecs.TableUnlock(Handle->world, Handle->table);
+
+        bool result = ((delegate* unmanaged<ecs_iter_t*, byte>)Handle->next)(Handle) != 0;
+
+        Handle->flags |= EcsIterIsValid;
+
+        if (result && Handle->table != null)
+            Ecs.TableLock(Handle->world, Handle->table);
+
+        return result;
+    }
+
+    /// <summary>
+    ///     Forward to Each callback.
+    /// </summary>
+    public void Each()
+    {
+        Callback();
+    }
+
+    /// <summary>
+    ///     Forward to callback.
+    /// </summary>
+    public void Callback()
+    {
+        Ecs.Assert(Handle->callback != default, "Iter/Each callback is not set.");
+        ((delegate* unmanaged<ecs_iter_t*, void>)Handle->callback)(Handle);
+    }
+
+    /// <summary>
+    ///     Free iterator resources.
+    /// </summary>
+    public void Fini()
+    {
+        if (Handle == null)
+            return;
+
+        if ((Handle->flags & EcsIterIsValid) != 0 && Handle->table != null)
+            Ecs.TableUnlock(Handle->world, Handle->table);
+
+        ecs_iter_fini(Handle);
+        Handle = null;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal UntypedField GetUntypedField(int index)
+    {
+        var size = (int)ecs_field_size(Handle, (byte)index);
+        return new UntypedField(
+            ecs_field_w_size(Handle, size, (byte)index),
+            size,
+            ecs_field_is_self(Handle, (byte)index) ? Handle->count : 1
+        );
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal UntypedField GetUntypedFieldAt(int index, int row)
+    {
+        return new UntypedField(
+            ecs_field_at_w_size(Handle, 0, (byte)index, row),
+            (int)ecs_field_size(Handle, (byte)index),
+            1
+        );
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal Field<T> GetField<T>(int index)
+    {
+        AssertField<T>(Handle, index);
+        UntypedField field = GetUntypedField(index);
+        return new Field<T>(field.Data, field.Length);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal Field<T> GetFieldAt<T>(int index, int row)
+    {
+        AssertField<T>(Handle, index);
+        UntypedField field = GetUntypedFieldAt(index, row);
+        return new Field<T>(field.Data, 1);
+    }
+
+    [Conditional("DEBUG")]
+    internal static void AssertField<T>(ecs_iter_t* iter, int index)
+    {
+        Ecs.Assert(index >= 0 && index < iter->field_count, "Field index out of range.");
+
+        if (ecs_id_is_tag(iter->world, iter->ids[index]) || ecs_id_is_wildcard(iter->ids[index]))
+        {
+            Ecs.Error($$"""
+                Invalid type argument "{{new Entity(iter->world, iter->ids[index])}}" at field index {{index}}. Component data cannot be retrieved for tag types.
+                [Query Name]: {{new Entity(iter->world, iter->system)}}
+                [Query Fields]: {{new Query(iter->query).Str()}}
+                """
+            );
+        }
+
+        if (Ecs.TypeIdIs<T>(iter->world, iter->ids[index]))
+            return;
+
+        Ecs.Error($$"""
+            Type argument mismatch at field index {{index}}.
+            [Query Name]: {{new Entity(iter->world, iter->system)}}
+            [Query Fields]: {{new Query(iter->query).Str()}}
+            [Expected Type]: {{new Entity(iter->world, iter->ids[index])}}
+            [Provided Type]: {{new Entity(iter->world, Type<T>.Id(iter->world))}}
+            """
+        );
+    }
+
+    /// <summary>
+    ///     Gets an enumerator for iter.
+    /// </summary>
+    /// <returns></returns>
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+    IEnumerator<int> IEnumerable<int>.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+    /// <summary>
+    ///     Gets an enumerator for iter.
+    /// </summary>
+    /// <returns></returns>
+    public IterEnumerator GetEnumerator()
+    {
+        return new IterEnumerator(Handle->count);
+    }
+
+    /// <summary>
+    ///     Converts a <see cref="Iter"/> instance to a <see cref="ecs_iter_t"/>*.
+    /// </summary>
+    /// <param name="iter"></param>
+    /// <returns></returns>
+    public static ecs_iter_t* To(Iter iter)
+    {
+        return iter.Handle;
+    }
+
+    /// <summary>
+    ///     Converts a <see cref="ecs_iter_t"/>* instance to a <see cref="Iter"/>.
+    /// </summary>
+    /// <param name="iter"></param>
+    /// <returns></returns>
+    public static Iter From(ecs_iter_t* iter)
+    {
+        return new Iter(iter);
+    }
+
+    /// <summary>
+    ///     Converts a <see cref="Iter"/> instance to a <see cref="ecs_iter_t"/>*.
+    /// </summary>
+    /// <param name="iter"></param>
+    /// <returns></returns>
+    public static implicit operator ecs_iter_t*(Iter iter)
+    {
+        return To(iter);
+    }
+
+    /// <summary>
+    ///     Converts a <see cref="ecs_iter_t"/>* instance to a <see cref="Iter"/>.
+    /// </summary>
+    /// <param name="iter"></param>
+    /// <returns></returns>
+    public static implicit operator Iter(ecs_iter_t* iter)
+    {
+        return From(iter);
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Iter"/> instances are equal.
+    /// </summary>
+    /// <param name="other"></param>
+    /// <returns></returns>
+    public bool Equals(Iter other)
+    {
+        return Handle == other.Handle;
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Iter"/> instances are equal.
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is Iter other && Equals(other);
+    }
+
+    /// <summary>
+    ///     Returns the hash code of te <see cref="Iter"/>.
+    /// </summary>
+    /// <returns></returns>
+    public override int GetHashCode()
+    {
+        return Handle->GetHashCode();
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Iter"/> instances are equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator ==(Iter left, Iter right)
+    {
+        return left.Equals(right);
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="Iter"/> instances are not equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator !=(Iter left, Iter right)
+    {
+        return !(left == right);
+    }
+}
+
+// Flecs.NET Extensions
+public unsafe partial struct Iter
+{
+    /// <summary>
+    ///     Returns the query being evaluated.
+    /// </summary>
+    /// <returns>The query.</returns>
+    public Query Query()
+    {
+        return new Query(Handle->query);
+    }
+
+    /// <summary>
+    ///     Get managed ref to the first element in a field.
+    /// </summary>
+    /// <param name="index">The index of the field in the iterator.</param>
+    /// <typeparam name="T">The field type.</typeparam>
+    /// <returns>Reference to first component of field.</returns>
+    [SuppressMessage("Usage", "CA1720")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref T Single<T>(int index)
+    {
+        return ref GetField<T>(index)[0];
+    }
+
+    /// <summary>
+    ///     Obtain span for a query field.
+    /// </summary>
+    /// <param name="index">The index of the field in the iterator.</param>
+    /// <typeparam name="T">The field type.</typeparam>
+    /// <returns>A span to the data of the field.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public Span<T> Span<T>(int index) where T : unmanaged
+    {
+        return GetSpan<T>(index);
+    }
+
+    /// <summary>
+    ///     Obtain pointer to a query field.
+    /// </summary>
+    /// <param name="index">The index of the field in the iterator.</param>
+    /// <typeparam name="T">The field type.</typeparam>
+    /// <returns>A pointer to the data of the field.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public T* Pointer<T>(int index) where T : unmanaged
+    {
+        return GetPointer<T>(index);
+    }
+
+    /// <summary>
+    ///     Get pointer to field at row.
+    /// </summary>
+    /// <param name="index">The index of the field in the iterator.</param>
+    /// <param name="row">The row.</param>
+    /// <typeparam name="T">The field type.</typeparam>
+    /// <returns>A pointer to the data of the field.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public T* PointerAt<T>(int index, int row) where T : unmanaged
+    {
+        return &Pointer<T>(index)[row];
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal Span<T> GetSpan<T>(int index)
+    {
+        Field<T> field = GetField<T>(index);
+        return new Span<T>(field.Data, field.Length);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal T* GetPointer<T>(int index)
+    {
+        AssertField<T>(Handle, index);
+        return (T*)ecs_field_w_size(Handle, Type<T>.Size, (byte)index);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal FieldData<T> GetFieldData<T>(byte index)
+    {
+        AssertField<T>(Handle, index);
+        return new FieldData<T>(Handle, index);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal IterationTechnique GetIterationTechnique(int fieldCount)
+    {
+        IterationTechnique flags = default;
+
+        int mask = (1 << fieldCount) - 1;
+
+        if ((Handle->row_fields & mask) != 0)
+            flags |= IterationTechnique.Sparse;
+
+        if (((Handle->ref_fields & mask) != 0 && Handle->ref_fields != Handle->row_fields) || (Handle->up_fields & mask) != 0 || (Handle->set_fields & mask) != mask)
+            flags |= IterationTechnique.Shared;
+
+        return flags;
+    }
+}
+
+/// <summary>
+///     Enumerator for iters.
+/// </summary>
+public struct IterEnumerator : IEnumerator<int>
+{
+    /// <summary>
+    ///     Length of the iter.
+    /// </summary>
+    public int Length { get; }
+
+    /// <summary>
+    ///     Current index of the iter.
+    /// </summary>
+    public int Current { get; private set; }
+
+    /// <summary>
+    ///     Current index of the iter.
+    /// </summary>
+    readonly object IEnumerator.Current => Current;
+
+    /// <summary>
+    ///     Create a new iter with the provided length.
+    /// </summary>
+    /// <param name="length"></param>
+    public IterEnumerator(int length)
+    {
+        Length = length;
+        Current = -1;
+    }
+
+    /// <summary>
+    ///     Moves to the next index of the iter.
+    /// </summary>
+    /// <returns></returns>
+    public bool MoveNext()
+    {
+        Current++;
+        return Current < Length;
+    }
+
+    /// <summary>
+    ///     Resets the index of the enumerator.
+    /// </summary>
+    public void Reset()
+    {
+        Current = -1;
+    }
+
+    /// <summary>
+    ///     Disposes of resources.
+    /// </summary>
+    public void Dispose()
+    {
+    }
+}
diff --git a/src/Flecs.NET/Core/IterIterable.cs b/src/Flecs.NET/Core/IterIterable.cs
index eb3ae4dc..8d71cb0b 100644
--- a/src/Flecs.NET/Core/IterIterable.cs
+++ b/src/Flecs.NET/Core/IterIterable.cs
@@ -1,449 +1,446 @@
-using System;
-using System.Runtime.CompilerServices;
-using Flecs.NET.Utilities;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-/// <summary>
-///     An iterator object that can be modified before iterating.
-/// </summary>
-public unsafe partial struct IterIterable : IEquatable<IterIterable>
-{
-    /// <summary>
-    ///     The iterator instance.
-    /// </summary>
-    public ecs_iter_t Iterator;
-
-    /// <summary>
-    ///     The iterable type.
-    /// </summary>
-    public readonly IterableType IterableType;
-
-    /// <summary>
-    ///     Creates an iter iterable.
-    /// </summary>
-    /// <param name="iterator">The iterator source.</param>
-    /// <param name="iterableType">The iterator type.</param>
-    public IterIterable(ecs_iter_t iterator, IterableType iterableType)
-    {
-        Iterator = iterator;
-        IterableType = iterableType;
-    }
-
-    /// <summary>
-    ///     Set value for iterator variable.
-    /// </summary>
-    /// <param name="varId">The variable id.</param>
-    /// <param name="value">The entity variable value.</param>
-    /// <returns>Reference to self.</returns>
-    public ref IterIterable SetVar(int varId, ulong value)
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
-            ecs_iter_set_var(it, varId, value);
-            return ref this;
-        }
-    }
-
-    /// <summary>
-    ///     Set value for iterator variable.
-    /// </summary>
-    /// <param name="name">The variable name.</param>
-    /// <param name="value">The entity variable value.</param>
-    /// <returns>Reference to self.</returns>
-    public ref IterIterable SetVar(string name, ulong value)
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            using NativeString nativeName = (NativeString)name;
-
-            ecs_query_iter_t* iter = &it->priv_.iter.query;
-            int varId = ecs_query_find_var(iter->query, nativeName);
-
-            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
-            ecs_iter_set_var(it, varId, value);
-
-            return ref this;
-        }
-    }
-
-    /// <summary>
-    ///     Set value for iterator variable.
-    /// </summary>
-    /// <param name="name">The variable name.</param>
-    /// <param name="value">The table variable value.</param>
-    /// <returns>Reference to self.</returns>
-    public ref IterIterable SetVar(string name, ecs_table_t* value)
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            using NativeString nativeName = (NativeString)name;
-
-            ecs_query_iter_t* iter = &it->priv_.iter.query;
-            int varId = ecs_query_find_var(iter->query, nativeName);
-
-            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
-            ecs_iter_set_var_as_table(it, varId, value);
-
-            return ref this;
-        }
-    }
-
-    /// <summary>
-    ///     Set value for iterator variable.
-    /// </summary>
-    /// <param name="name">The variable name.</param>
-    /// <param name="value">The table variable value.</param>
-    /// <returns>Reference to self.</returns>
-    public ref IterIterable SetVar(string name, ecs_table_range_t value)
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            using NativeString nativeName = (NativeString)name;
-
-            ecs_query_iter_t* iter = &it->priv_.iter.query;
-            int varId = ecs_query_find_var(iter->query, nativeName);
-
-            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
-            ecs_iter_set_var_as_range(it, varId, &value);
-
-            return ref this;
-        }
-    }
-
-    /// <summary>
-    ///     Set value for iterator variable.
-    /// </summary>
-    /// <param name="name">The variable name.</param>
-    /// <param name="value">The table variable value.</param>
-    /// <returns>Reference to self.</returns>
-    public ref IterIterable SetVar(string name, Table value)
-    {
-        ecs_table_range_t range;
-        range.table = value.GetTable();
-        range.offset = value.Offset;
-        range.count = value.Count;
-        return ref SetVar(name, range);
-    }
-
-    /// <summary>
-    ///     Serializes the iterator to a JSON string using the provided description.
-    /// </summary>
-    /// <param name="desc">The description settings for JSON serialization.</param>
-    /// <returns>A JSON string with the serialized iterator data, or an empty string if failed.</returns>
-    public string ToJson(in IterToJsonDesc desc)
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        fixed (ecs_iter_to_json_desc_t* ptr = &desc.Desc)
-        {
-            return NativeString.GetStringAndFree(ecs_iter_to_json(it, ptr));
-        }
-    }
-
-    /// <summary>
-    ///     Serializes the iterator to a JSON string.
-    /// </summary>
-    /// <returns>A JSON string with the serialized iterator data, or an empty string if failed.</returns>
-    public string ToJson()
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            return NativeString.GetStringAndFree(ecs_iter_to_json(it, null));
-        }
-    }
-
-    /// <summary>
-    ///     Returns total number of entities in result.
-    /// </summary>
-    /// <returns></returns>
-    public int Count()
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            int result = 0;
-            while (this.GetNext(it))
-                result += Iterator.count;
-            return result;
-        }
-    }
-
-    /// <summary>
-    ///     Returns true if iterator yields at least once result.
-    /// </summary>
-    /// <returns></returns>
-    public bool IsTrue()
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            bool result = this.GetNext(it);
-            if (result)
-                ecs_iter_fini(it);
-            return result;
-        }
-    }
-
-    /// <summary>
-    ///     Return first matching entity.
-    /// </summary>
-    /// <returns></returns>
-    public Entity First()
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            Entity result = default;
-
-            if (this.GetNext(it) && it->count != 0)
-            {
-                result = new Entity(it->world, it->entities[0]);
-                ecs_iter_fini(it);
-            }
-
-            return result;
-        }
-    }
-
-    /// <summary>
-    ///     Limit results to tables with specified group id (grouped queries only)
-    /// </summary>
-    /// <param name="groupId">The group id.</param>
-    /// <returns>Reference to self.</returns>
-    public ref IterIterable SetGroup(ulong groupId)
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            ecs_iter_set_group(it, groupId);
-            return ref this;
-        }
-    }
-
-    /// <summary>
-    ///     Limit results to tables with specified group id (grouped queries only)
-    /// </summary>
-    /// <typeparam name="T">The group type.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public ref IterIterable SetGroup<T>()
-    {
-        fixed (ecs_iter_t* it = &Iterator)
-        {
-            ecs_iter_set_group(it, Type<T>.Id(it->real_world));
-            return ref this;
-        }
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="IterIterable"/> instances are equal.
-    /// </summary>
-    /// <param name="other"></param>
-    /// <returns></returns>
-    public bool Equals(IterIterable other)
-    {
-        return Iterator == other.Iterator && IterableType == other.IterableType;
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="IterIterable"/> instances are equal.
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    public override bool Equals(object? obj)
-    {
-        return obj is IterIterable other && Equals(other);
-    }
-
-    /// <summary>
-    ///     Returns the hash code of the <see cref="IterIterable"/>.
-    /// </summary>
-    /// <returns></returns>
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(Iterator.GetHashCode(), IterableType.GetHashCode());
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="IterIterable"/> instances are equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator ==(IterIterable left, IterIterable right)
-    {
-        return left.Equals(right);
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="IterIterable"/> instances are not equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator !=(IterIterable left, IterIterable right)
-    {
-        return !(left == right);
-    }
-}
-
-// IIterIterable Interface
-public unsafe partial struct IterIterable : IIterIterable
-{
-    ref IterIterable IIterIterable.Underlying => ref this;
-    ref ecs_iter_t IIterIterable.Iterator => ref Iterator;
-    IterableType IIterIterable.IterableType => IterableType;
-}
-
-// IIterableBase Interface
-public unsafe partial struct IterIterable : IIterableBase
-{
-    /// <inheritdoc cref="IIterableBase.World"/>
-    ecs_world_t* IIterableBase.World => Iterator.world;
-
-    /// <inheritdoc cref="IIterableBase.GetIter"/>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public ecs_iter_t GetIter(World world = default)
-    {
-        if (world == null)
-            return Iterator;
-
-        return world == null
-            ? Iterator
-            : Iterator with { world = world };
-    }
-
-    /// <inheritdoc cref="IIterableBase.GetNext"/>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool GetNext(Iter it)
-    {
-        return IterableType switch
-        {
-            IterableType.Query => ecs_query_next(it),
-            IterableType.Worker => ecs_worker_next(it),
-            IterableType.Page => ecs_page_next(it),
-            _ => throw new Ecs.ErrorException()
-        };
-    }
-}
-
-// IIterable Interface
-public unsafe partial struct IterIterable : IIterable
-{
-    /// <inheritdoc cref="IIterable.Run(Ecs.RunCallback)"/>
-    public void Run(Ecs.RunCallback callback)
-    {
-        Invoker.Run(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Run(Ecs.RunCallback)"/>
-    public void Run(delegate*<Iter, void> callback)
-    {
-        Invoker.Run(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Iter(Ecs.IterCallback)"/>
-    public void Iter(Ecs.IterCallback callback)
-    {
-        Invoker.Iter(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Iter(Ecs.IterCallback)"/>
-    public void Iter(delegate*<Iter, void> callback)
-    {
-        Invoker.Iter(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Each(Ecs.EachEntityCallback)"/>
-    public void Each(Ecs.EachEntityCallback callback)
-    {
-        Invoker.Each(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Each(Ecs.EachEntityCallback)"/>
-    public void Each(delegate*<Entity, void> callback)
-    {
-        Invoker.Each(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Each(Ecs.EachIterCallback)"/>
-    public void Each(Ecs.EachIterCallback callback)
-    {
-        Invoker.Each(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Each(Ecs.EachIterCallback)"/>
-    public void Each(delegate*<Iter, int, void> callback)
-    {
-        Invoker.Each(ref this, callback);
-    }
-
-    /// <inheritdoc cref="IIterable.Page(int, int)"/>
-    public PageIterable Page(int offset, int limit)
-    {
-        return new PageIterable(GetIter(), offset, limit);
-    }
-
-    /// <inheritdoc cref="IIterable.Worker(int, int)"/>
-    public WorkerIterable Worker(int index, int count)
-    {
-        return new WorkerIterable(GetIter(), index, count);
-    }
-
-    /// <inheritdoc cref="IIterable.Iter(Flecs.NET.Core.World)"/>
-    public IterIterable Iter(World world = default)
-    {
-        return new IterIterable(GetIter(world), IterableType);
-    }
-
-    /// <inheritdoc cref="IIterable.Iter(Flecs.NET.Core.Iter)"/>
-    public IterIterable Iter(Iter it)
-    {
-        return Iter(it.World());
-    }
-
-    /// <inheritdoc cref="IIterable.Iter(Flecs.NET.Core.Entity)"/>
-    public IterIterable Iter(Entity entity)
-    {
-        return Iter(entity.CsWorld());
-    }
-
-    /// <inheritdoc cref="IIterable.SetVar(int, ulong)"/>
-    IterIterable IIterable.SetVar(int varId, ulong value)
-    {
-        return Iter().SetVar(varId, value);
-    }
-
-    /// <inheritdoc cref="IIterable.SetVar(string, ulong)"/>
-    IterIterable IIterable.SetVar(string name, ulong value)
-    {
-        return Iter().SetVar(name, value);
-    }
-
-    /// <inheritdoc cref="IIterable.SetVar(string, ecs_table_t*)"/>
-    IterIterable IIterable.SetVar(string name, ecs_table_t* value)
-    {
-        return Iter().SetVar(name, value);
-    }
-
-    /// <inheritdoc cref="IIterable.SetVar(string, ecs_table_range_t)"/>
-    IterIterable IIterable.SetVar(string name, ecs_table_range_t value)
-    {
-        return Iter().SetVar(name, value);
-    }
-
-    /// <inheritdoc cref="IIterable.SetVar(string, Table)"/>
-    IterIterable IIterable.SetVar(string name, Table value)
-    {
-        return Iter().SetVar(name, value);
-    }
-
-    /// <inheritdoc cref="IIterable.SetGroup(ulong)"/>
-    IterIterable IIterable.SetGroup(ulong groupId)
-    {
-        return Iter().SetGroup(groupId);
-    }
-
-    /// <inheritdoc cref="IIterable.SetGroup{T}()"/>
-    IterIterable IIterable.SetGroup<T>()
-    {
-        return Iter().SetGroup<T>();
-    }
-}
+using System;
+using System.Runtime.CompilerServices;
+using Flecs.NET.Utilities;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+/// <summary>
+///     An iterator object that can be modified before iterating.
+/// </summary>
+public unsafe partial struct IterIterable : IEquatable<IterIterable>
+{
+    /// <summary>
+    ///     The iterator instance.
+    /// </summary>
+    public ecs_iter_t Iterator;
+
+    /// <summary>
+    ///     The iterable type.
+    /// </summary>
+    public readonly IterableType IterableType;
+
+    /// <summary>
+    ///     Creates an iter iterable.
+    /// </summary>
+    /// <param name="iterator">The iterator source.</param>
+    /// <param name="iterableType">The iterator type.</param>
+    public IterIterable(ecs_iter_t iterator, IterableType iterableType)
+    {
+        Iterator = iterator;
+        IterableType = iterableType;
+    }
+
+    /// <summary>
+    ///     Set value for iterator variable.
+    /// </summary>
+    /// <param name="varId">The variable id.</param>
+    /// <param name="value">The entity variable value.</param>
+    /// <returns>Reference to self.</returns>
+    public ref IterIterable SetVar(int varId, ulong value)
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
+            ecs_iter_set_var(it, varId, value);
+            return ref this;
+        }
+    }
+
+    /// <summary>
+    ///     Set value for iterator variable.
+    /// </summary>
+    /// <param name="name">The variable name.</param>
+    /// <param name="value">The entity variable value.</param>
+    /// <returns>Reference to self.</returns>
+    public ref IterIterable SetVar(string name, ulong value)
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            using NativeString nativeName = (NativeString)name;
+
+            int varId = ecs_query_find_var(it->query, nativeName);
+
+            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
+            ecs_iter_set_var(it, varId, value);
+
+            return ref this;
+        }
+    }
+
+    /// <summary>
+    ///     Set value for iterator variable.
+    /// </summary>
+    /// <param name="name">The variable name.</param>
+    /// <param name="value">The table variable value.</param>
+    /// <returns>Reference to self.</returns>
+    public ref IterIterable SetVar(string name, ecs_table_t* value)
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            using NativeString nativeName = (NativeString)name;
+
+            int varId = ecs_query_find_var(it->query, nativeName);
+
+            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
+            ecs_iter_set_var_as_table(it, varId, value);
+
+            return ref this;
+        }
+    }
+
+    /// <summary>
+    ///     Set value for iterator variable.
+    /// </summary>
+    /// <param name="name">The variable name.</param>
+    /// <param name="value">The table variable value.</param>
+    /// <returns>Reference to self.</returns>
+    public ref IterIterable SetVar(string name, ecs_table_range_t value)
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            using NativeString nativeName = (NativeString)name;
+
+            int varId = ecs_query_find_var(it->query, nativeName);
+
+            Ecs.Assert(varId != -1, nameof(ECS_INVALID_PARAMETER));
+            ecs_iter_set_var_as_range(it, varId, &value);
+
+            return ref this;
+        }
+    }
+
+    /// <summary>
+    ///     Set value for iterator variable.
+    /// </summary>
+    /// <param name="name">The variable name.</param>
+    /// <param name="value">The table variable value.</param>
+    /// <returns>Reference to self.</returns>
+    public ref IterIterable SetVar(string name, Table value)
+    {
+        ecs_table_range_t range;
+        range.table = value.GetTable();
+        range.offset = value.Offset;
+        range.count = value.Count;
+        return ref SetVar(name, range);
+    }
+
+    /// <summary>
+    ///     Serializes the iterator to a JSON string using the provided description.
+    /// </summary>
+    /// <param name="desc">The description settings for JSON serialization.</param>
+    /// <returns>A JSON string with the serialized iterator data, or an empty string if failed.</returns>
+    public string ToJson(in IterToJsonDesc desc)
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        fixed (ecs_iter_to_json_desc_t* ptr = &desc.Desc)
+        {
+            return NativeString.GetStringAndFree(ecs_iter_to_json(it, ptr));
+        }
+    }
+
+    /// <summary>
+    ///     Serializes the iterator to a JSON string.
+    /// </summary>
+    /// <returns>A JSON string with the serialized iterator data, or an empty string if failed.</returns>
+    public string ToJson()
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            return NativeString.GetStringAndFree(ecs_iter_to_json(it, null));
+        }
+    }
+
+    /// <summary>
+    ///     Returns total number of entities in result.
+    /// </summary>
+    /// <returns></returns>
+    public int Count()
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            int result = 0;
+            while (this.GetNext(it))
+                result += Iterator.count;
+            return result;
+        }
+    }
+
+    /// <summary>
+    ///     Returns true if iterator yields at least once result.
+    /// </summary>
+    /// <returns></returns>
+    public bool IsTrue()
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            bool result = this.GetNext(it);
+            if (result)
+                ecs_iter_fini(it);
+            return result;
+        }
+    }
+
+    /// <summary>
+    ///     Return first matching entity.
+    /// </summary>
+    /// <returns></returns>
+    public Entity First()
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            Entity result = default;
+
+            if (this.GetNext(it) && it->count != 0)
+            {
+                result = new Entity(it->world, it->entities[0]);
+                ecs_iter_fini(it);
+            }
+
+            return result;
+        }
+    }
+
+    /// <summary>
+    ///     Limit results to tables with specified group id (grouped queries only)
+    /// </summary>
+    /// <param name="groupId">The group id.</param>
+    /// <returns>Reference to self.</returns>
+    public ref IterIterable SetGroup(ulong groupId)
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            ecs_iter_set_group(it, groupId);
+            return ref this;
+        }
+    }
+
+    /// <summary>
+    ///     Limit results to tables with specified group id (grouped queries only)
+    /// </summary>
+    /// <typeparam name="T">The group type.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public ref IterIterable SetGroup<T>()
+    {
+        fixed (ecs_iter_t* it = &Iterator)
+        {
+            ecs_iter_set_group(it, Type<T>.Id(it->real_world));
+            return ref this;
+        }
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="IterIterable"/> instances are equal.
+    /// </summary>
+    /// <param name="other"></param>
+    /// <returns></returns>
+    public bool Equals(IterIterable other)
+    {
+        return Iterator == other.Iterator && IterableType == other.IterableType;
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="IterIterable"/> instances are equal.
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is IterIterable other && Equals(other);
+    }
+
+    /// <summary>
+    ///     Returns the hash code of the <see cref="IterIterable"/>.
+    /// </summary>
+    /// <returns></returns>
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(Iterator.GetHashCode(), IterableType.GetHashCode());
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="IterIterable"/> instances are equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator ==(IterIterable left, IterIterable right)
+    {
+        return left.Equals(right);
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="IterIterable"/> instances are not equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator !=(IterIterable left, IterIterable right)
+    {
+        return !(left == right);
+    }
+}
+
+// IIterIterable Interface
+public unsafe partial struct IterIterable : IIterIterable
+{
+    ref IterIterable IIterIterable.Underlying => ref this;
+    ref ecs_iter_t IIterIterable.Iterator => ref Iterator;
+    IterableType IIterIterable.IterableType => IterableType;
+}
+
+// IIterableBase Interface
+public unsafe partial struct IterIterable : IIterableBase
+{
+    /// <inheritdoc cref="IIterableBase.World"/>
+    ecs_world_t* IIterableBase.World => Iterator.world;
+
+    /// <inheritdoc cref="IIterableBase.GetIter"/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ecs_iter_t GetIter(World world = default)
+    {
+        if (world == null)
+            return Iterator;
+
+        return world == null
+            ? Iterator
+            : Iterator with { world = world };
+    }
+
+    /// <inheritdoc cref="IIterableBase.GetNext"/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool GetNext(Iter it)
+    {
+        return IterableType switch
+        {
+            IterableType.Query => ecs_query_next(it),
+            IterableType.Worker => ecs_worker_next(it),
+            IterableType.Page => ecs_page_next(it),
+            _ => throw new Ecs.ErrorException()
+        };
+    }
+}
+
+// IIterable Interface
+public unsafe partial struct IterIterable : IIterable
+{
+    /// <inheritdoc cref="IIterable.Run(Ecs.RunCallback)"/>
+    public void Run(Ecs.RunCallback callback)
+    {
+        Invoker.Run(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Run(Ecs.RunCallback)"/>
+    public void Run(delegate*<Iter, void> callback)
+    {
+        Invoker.Run(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Iter(Ecs.IterCallback)"/>
+    public void Iter(Ecs.IterCallback callback)
+    {
+        Invoker.Iter(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Iter(Ecs.IterCallback)"/>
+    public void Iter(delegate*<Iter, void> callback)
+    {
+        Invoker.Iter(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Each(Ecs.EachEntityCallback)"/>
+    public void Each(Ecs.EachEntityCallback callback)
+    {
+        Invoker.Each(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Each(Ecs.EachEntityCallback)"/>
+    public void Each(delegate*<Entity, void> callback)
+    {
+        Invoker.Each(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Each(Ecs.EachIterCallback)"/>
+    public void Each(Ecs.EachIterCallback callback)
+    {
+        Invoker.Each(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Each(Ecs.EachIterCallback)"/>
+    public void Each(delegate*<Iter, int, void> callback)
+    {
+        Invoker.Each(ref this, callback);
+    }
+
+    /// <inheritdoc cref="IIterable.Page(int, int)"/>
+    public PageIterable Page(int offset, int limit)
+    {
+        return new PageIterable(GetIter(), offset, limit);
+    }
+
+    /// <inheritdoc cref="IIterable.Worker(int, int)"/>
+    public WorkerIterable Worker(int index, int count)
+    {
+        return new WorkerIterable(GetIter(), index, count);
+    }
+
+    /// <inheritdoc cref="IIterable.Iter(Flecs.NET.Core.World)"/>
+    public IterIterable Iter(World world = default)
+    {
+        return new IterIterable(GetIter(world), IterableType);
+    }
+
+    /// <inheritdoc cref="IIterable.Iter(Flecs.NET.Core.Iter)"/>
+    public IterIterable Iter(Iter it)
+    {
+        return Iter(it.World());
+    }
+
+    /// <inheritdoc cref="IIterable.Iter(Flecs.NET.Core.Entity)"/>
+    public IterIterable Iter(Entity entity)
+    {
+        return Iter(entity.CsWorld());
+    }
+
+    /// <inheritdoc cref="IIterable.SetVar(int, ulong)"/>
+    IterIterable IIterable.SetVar(int varId, ulong value)
+    {
+        return Iter().SetVar(varId, value);
+    }
+
+    /// <inheritdoc cref="IIterable.SetVar(string, ulong)"/>
+    IterIterable IIterable.SetVar(string name, ulong value)
+    {
+        return Iter().SetVar(name, value);
+    }
+
+    /// <inheritdoc cref="IIterable.SetVar(string, ecs_table_t*)"/>
+    IterIterable IIterable.SetVar(string name, ecs_table_t* value)
+    {
+        return Iter().SetVar(name, value);
+    }
+
+    /// <inheritdoc cref="IIterable.SetVar(string, ecs_table_range_t)"/>
+    IterIterable IIterable.SetVar(string name, ecs_table_range_t value)
+    {
+        return Iter().SetVar(name, value);
+    }
+
+    /// <inheritdoc cref="IIterable.SetVar(string, Table)"/>
+    IterIterable IIterable.SetVar(string name, Table value)
+    {
+        return Iter().SetVar(name, value);
+    }
+
+    /// <inheritdoc cref="IIterable.SetGroup(ulong)"/>
+    IterIterable IIterable.SetGroup(ulong groupId)
+    {
+        return Iter().SetGroup(groupId);
+    }
+
+    /// <inheritdoc cref="IIterable.SetGroup{T}()"/>
+    IterIterable IIterable.SetGroup<T>()
+    {
+        return Iter().SetGroup<T>();
+    }
+}
diff --git a/src/Flecs.NET/Core/QueryBuilder.cs b/src/Flecs.NET/Core/QueryBuilder.cs
index 5052a390..7f8d503a 100644
--- a/src/Flecs.NET/Core/QueryBuilder.cs
+++ b/src/Flecs.NET/Core/QueryBuilder.cs
@@ -1,1959 +1,1965 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Flecs.NET.Core.BindingContext;
-using Flecs.NET.Utilities;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-/// <summary>
-///     A wrapper around <see cref="ecs_query_desc_t"/>.
-/// </summary>
-public unsafe struct QueryBuilder : IDisposable, IEquatable<QueryBuilder>, IQueryBuilder<QueryBuilder, Query>
-{
-    private ecs_world_t* _world;
-    private ecs_query_desc_t _desc;
-    private int _termIndex;
-    private int _termCount;
-    private TermIdType _termIdType;
-    private ref ecs_term_t CurrentTerm => ref Desc.terms[_termIndex];
-    private ref ecs_term_ref_t CurrentTermId
-    {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        get
-        {
-            switch (_termIdType)
-            {
-                case TermIdType.First:
-                    return ref CurrentTerm.first;
-                case TermIdType.Second:
-                    return ref CurrentTerm.second;
-                case TermIdType.Src:
-                    return ref CurrentTerm.src;
-                default:
-                    return ref Unsafe.NullRef<ecs_term_ref_t>();
-            }
-        }
-    }
-
-    internal ref QueryContext QueryContext => ref *EnsureQueryContext();
-    internal ref GroupByContext GroupByContext => ref *EnsureGroupByContext();
-
-    ref QueryBuilder IQueryBuilderBase.QueryBuilder => ref this;
-
-    /// <summary>
-    ///     A reference to the world.
-    /// </summary>
-    public ref ecs_world_t* World => ref _world;
-
-    /// <summary>
-    ///     A reference to the query description.
-    /// </summary>
-    public ref ecs_query_desc_t Desc => ref _desc;
-
-    /// <summary>
-    ///     Creates a query builder for the provided world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    public QueryBuilder(ecs_world_t* world)
-    {
-        _world = world;
-        _desc = default;
-        _termIndex = default;
-        _termCount = default;
-        _termIdType = TermIdType.Src;
-        QueryContext = default;
-    }
-
-    /// <summary>
-    ///     Creates a query builder for the provided world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="entity">The query entity.</param>
-    public QueryBuilder(ecs_world_t* world, ulong entity) : this(world)
-    {
-        Desc.entity = entity;
-    }
-
-    /// <summary>
-    ///     Creates a query builder for the provided world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="name">The query name.</param>
-    public QueryBuilder(ecs_world_t* world, string name) : this(world)
-    {
-        if (string.IsNullOrEmpty(name))
-            return;
-
-        using NativeString nativeName = (NativeString)name;
-
-        ecs_entity_desc_t desc = default;
-        desc.name = nativeName;
-        desc.sep = Pointers.DefaultSeparator;
-        desc.root_sep = Pointers.DefaultSeparator;
-        Desc.entity = ecs_entity_init(World, &desc);
-    }
-
-    /// <summary>
-    ///     Cleans up native resources. This should be called if the query builder
-    ///     will be discarded and .Build() isn't called.
-    /// </summary>
-    public void Dispose()
-    {
-        QueryContext.Free(ref QueryContext);
-        GroupByContext.Free(ref GroupByContext);
-        this = default;
-    }
-
-    /// <summary>
-    ///     Builds a new Query.
-    /// </summary>
-    /// <returns></returns>
-    public Query Build()
-    {
-        fixed (ecs_query_desc_t* ptr = &Desc)
-            return new Query(ecs_query_init(World, ptr));
-    }
-
-    /// <summary>
-    ///     The self flags indicates the term identifier itself is used.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Self()
-    {
-        AssertTermId();
-        CurrentTermId.id |= EcsSelf;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify value of identifier by id.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Id(ulong id)
-    {
-        AssertTermId();
-        CurrentTermId.id = id;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify value of identifier by id. Almost the same as id(entity), but this
-    ///     operation explicitly sets the EcsIsEntity flag. This forces the id to
-    ///     be interpreted as entity, whereas not setting the flag would implicitly
-    ///     convert ids for builtin variables such as EcsThis to a variable.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Entity(ulong entity)
-    {
-        AssertTermId();
-        CurrentTermId.id = entity | EcsIsEntity;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify value of identifier by name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Name(string name)
-    {
-        AssertTermId();
-
-        NativeString nativeName = (NativeString)name;
-        QueryContext.Strings.Add(nativeName);
-
-        CurrentTermId.id |= EcsIsEntity;
-        CurrentTermId.name = nativeName;
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify identifier is a variable (resolved at query evaluation time).
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Var(string name)
-    {
-        AssertTermId();
-
-        NativeString nativeName = (NativeString)name;
-        QueryContext.Strings.Add(nativeName);
-
-        CurrentTermId.id |= EcsIsVariable;
-        CurrentTermId.name = nativeName;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets term id.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Term(ulong id)
-    {
-        return ref Id(id);
-    }
-
-    /// <summary>
-    ///     Call prior to setting values for src identifier.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Src()
-    {
-        AssertTerm();
-        _termIdType = TermIdType.Src;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Call prior to setting values for first identifier. This is either the
-    ///     component identifier, or first element of a pair (in case second is
-    ///     populated as well).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder First()
-    {
-        AssertTerm();
-        _termIdType = TermIdType.First;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Call prior to setting values for second identifier. This is the second
-    ///     element of a pair. Requires that First() is populated as well.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Second()
-    {
-        AssertTerm();
-        _termIdType = TermIdType.Second;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Select src identifier, initialize it with entity id.
-    /// </summary>
-    /// <param name="srcId"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Src(ulong srcId)
-    {
-        return ref Src().Id(srcId);
-    }
-
-    /// <summary>
-    ///     Select src identifier, initialize it with id associated with type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Src<T>()
-    {
-        return ref Src(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Select src identifier, initialize it with id associated with enum member.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Src<T>(T value) where T : Enum
-    {
-        return ref Src(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Select src identifier, initialize it with name. If name starts with a $
-    ///     the name is interpreted as a variable.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Src(string name)
-    {
-        Src();
-        return ref name[0] == '$' ? ref Var(name[1..]) : ref Name(name);
-    }
-
-    /// <summary>
-    ///     Select first identifier, initialize it with entity id.
-    /// </summary>
-    /// <param name="firstId"></param>
-    /// <returns></returns>
-    public ref QueryBuilder First(ulong firstId)
-    {
-        return ref First().Id(firstId);
-    }
-
-    /// <summary>
-    ///     Select first identifier, initialize it with id associated with type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder First<T>()
-    {
-        return ref First(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Select first identifier, initialize it with id associated with enum member.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder First<T>(T value) where T : Enum
-    {
-        return ref First(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Select first identifier, initialize it with name. If name starts with a $
-    ///     the name is interpreted as a variable.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder First(string name)
-    {
-        First();
-        return ref name[0] == '$' ? ref Var(name[1..]) : ref Name(name);
-    }
-
-    /// <summary>
-    ///     Select second identifier, initialize it with entity id.
-    /// </summary>
-    /// <param name="secondId"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Second(ulong secondId)
-    {
-        return ref Second().Id(secondId);
-    }
-
-    /// <summary>
-    ///     Select second identifier, initialize it with id associated with type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Second<T>()
-    {
-        return ref Second(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Select second identifier, initialize it with id associated with enum member.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Second<T>(T value) where T : Enum
-    {
-        return ref Second(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Select second identifier, initialize it with name. If name starts with a $
-    ///     the name is interpreted as a variable.
-    /// </summary>
-    /// <param name="secondName"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Second(string secondName)
-    {
-        Second();
-        return ref secondName[0] == '$' ? ref Var(secondName[1..]) : ref Name(secondName);
-    }
-
-    /// <summary>
-    ///     The up flag indicates that the term identifier may be substituted by
-    ///     traversing a relationship upwards. For example: substitute the identifier
-    ///     with its parent by traversing the ChildOf relationship.
-    /// </summary>
-    /// <param name="traverse"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Up(ulong traverse = 0)
-    {
-        AssertTermId();
-        Ecs.Assert(_termIdType == TermIdType.Src, "Up traversal can only be applied to term source.");
-
-        CurrentTermId.id |= EcsUp;
-
-        if (traverse != 0)
-            CurrentTerm.trav = traverse;
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     The up flag indicates that the term identifier may be substituted by
-    ///     traversing a relationship upwards. For example: substitute the identifier
-    ///     with its parent by traversing the ChildOf relationship.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Up<T>()
-    {
-        return ref Up(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     The up flag indicates that the term identifier may be substituted by
-    ///     traversing a relationship upwards. For example: substitute the identifier
-    ///     with its parent by traversing the ChildOf relationship.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Up<T>(T value) where T : Enum
-    {
-        return ref Up(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     The cascade flag is like up, but returns results in breadth-first order.
-    ///     Only supported for Query.
-    /// </summary>
-    /// <param name="traverse"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Cascade(ulong traverse = 0)
-    {
-        AssertTermId();
-
-        Up();
-        CurrentTermId.id |= EcsCascade;
-
-        if (traverse != 0)
-            CurrentTerm.trav = traverse;
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     The cascade flag is like up, but returns results in breadth-first order.
-    ///     Only supported for Query.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Cascade<T>()
-    {
-        return ref Cascade(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     The cascade flag is like up, but returns results in breadth-first order.
-    ///     Only supported for Query.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Cascade<T>(T value) where T : Enum
-    {
-        return ref Cascade(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Use with cascade to iterate results in descending (bottom -> top) order
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Descend()
-    {
-        AssertTermId();
-        CurrentTermId.id |= EcsDesc;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Same as up(), exists for backwards compatibility.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Parent()
-    {
-        return ref Up();
-    }
-
-    /// <summary>
-    ///     Specify relationship to traverse, and flags to indicate direction.
-    /// </summary>
-    /// <param name="traverse"></param>
-    /// <param name="flags"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Trav(ulong traverse, uint flags = 0)
-    {
-        AssertTermId();
-        CurrentTerm.trav = traverse;
-        CurrentTermId.id |= flags;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify relationship to traverse, and flags to indicate direction.
-    /// </summary>
-    /// <param name="flags"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Trav<T>(uint flags = 0)
-    {
-        return ref Trav(Type<T>.Id(World), flags);
-    }
-
-    /// <summary>
-    ///     Specify relationship to traverse, and flags to indicate direction.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="flags"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        return ref Trav(Type<T>.Id(World, value), flags);
-    }
-
-    /// <summary>
-    ///     Set id flags for term.
-    /// </summary>
-    /// <param name="flags"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Flags(ulong flags)
-    {
-        AssertTerm();
-        CurrentTerm.id |= flags;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set read/write access of term.
-    /// </summary>
-    /// <param name="inOut"></param>
-    /// <returns></returns>
-    public ref QueryBuilder InOut(ecs_inout_kind_t inOut)
-    {
-        AssertTerm();
-        CurrentTerm.inout = (short)inOut;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set read/write access for stage. Use this when a system reads or writes
-    ///     components other than the ones provided by the query. This information
-    ///     can be used by schedulers to insert sync/merge points between systems
-    ///     where deferred operations are flushed.
-    ///     Setting this is optional. If not set, the value of the accessed component
-    ///     may be out of sync for at most one frame.
-    /// </summary>
-    /// <param name="inOut"></param>
-    /// <returns></returns>
-    public ref QueryBuilder InOutStage(ecs_inout_kind_t inOut)
-    {
-        AssertTerm();
-        CurrentTerm.inout = (short)inOut;
-        if (CurrentTerm.oper != (short)EcsNot)
-            Src().Entity(0);
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Short for InOutStage(EcsOut).
-    ///     Use when system uses add, remove or set.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Write()
-    {
-        return ref InOutStage(EcsOut);
-    }
-
-    /// <summary>
-    ///     Short for InOutStage(EcsIn).
-    ///     Use when system uses get.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Read()
-    {
-        return ref InOutStage(EcsIn);
-    }
-
-    /// <summary>
-    ///     Short for InOutStage(EcsInOut).
-    ///     Use when system uses get_mut.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder ReadWrite()
-    {
-        return ref InOutStage(EcsInOut);
-    }
-
-    /// <summary>
-    ///     Short for InOut(EcsIn)
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder In()
-    {
-        return ref InOut(EcsIn);
-    }
-
-    /// <summary>
-    ///     Short for InOut(EcsOut)
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Out()
-    {
-        return ref InOut(EcsOut);
-    }
-
-    /// <summary>
-    ///     Short for InOut(EcsInOut)
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder InOut()
-    {
-        return ref InOut(EcsInOut);
-    }
-
-    /// <summary>
-    ///     Short for InOut(EcsInOutNone)
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder InOutNone()
-    {
-        return ref InOut(EcsInOutNone);
-    }
-
-    /// <summary>
-    ///     Set operator of term.
-    /// </summary>
-    /// <param name="oper"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Oper(ecs_oper_kind_t oper)
-    {
-        AssertTerm();
-        CurrentTerm.oper = (short)oper;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Short for Oper(EcsAnd).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder And()
-    {
-        return ref Oper(EcsAnd);
-    }
-
-    /// <summary>
-    ///     Short for Oper(EcsOr).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Or()
-    {
-        return ref Oper(EcsOr);
-    }
-
-    /// <summary>
-    ///     Short for Oper(EcsNot).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Not()
-    {
-        return ref Oper(EcsNot);
-    }
-
-    /// <summary>
-    ///     Short for Oper(EcsOptional).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Optional()
-    {
-        return ref Oper(EcsOptional);
-    }
-
-
-    /// <summary>
-    ///     Short for Oper(EcsAndFrom).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder AndFrom()
-    {
-        return ref Oper(EcsAndFrom);
-    }
-
-    /// <summary>
-    ///     Short for Oper(EcsOFrom).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder OrFrom()
-    {
-        return ref Oper(EcsOrFrom);
-    }
-
-    /// <summary>
-    ///     Short for Oper(EcsNotFrom).
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder NotFrom()
-    {
-        return ref Oper(EcsNotFrom);
-    }
-
-    /// <summary>
-    ///     Match singleton.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Singleton()
-    {
-        AssertTerm();
-        Ecs.Assert(CurrentTerm.id != 0 || CurrentTerm.first.id != 0, "no component specified for singleton");
-
-        ulong singletonId = CurrentTerm.id;
-
-        if (singletonId == 0)
-            singletonId = CurrentTerm.first.id;
-
-        Ecs.Assert(singletonId != 0, nameof(ECS_INVALID_PARAMETER));
-        CurrentTerm.src.id = !Ecs.IsPair(singletonId) ? singletonId : Ecs.PairFirst(World, singletonId);
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Filter terms are not triggered on by observers.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Filter()
-    {
-        CurrentTerm.inout = (short)EcsInOutFilter;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Set query flags for advanced usage
-    /// </summary>
-    /// <param name="flags"></param>
-    /// <returns></returns>
-    public ref QueryBuilder QueryFlags(uint flags)
-    {
-        Desc.flags |= flags;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets the cache kind.
-    /// </summary>
-    /// <param name="kind"></param>
-    /// <returns></returns>
-    public ref QueryBuilder CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Desc.cache_kind = kind;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Cache query terms that are cacheable.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Cached()
-    {
-        return ref CacheKind(EcsQueryCacheAuto);
-    }
-
-    /// <summary>
-    ///     Query expression. Should not be set at the same time as terms array.
-    /// </summary>
-    /// <param name="expr"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Expr(string expr)
-    {
-        Ecs.Assert(Desc.expr == null, "QueryBuilder.Expr() cannot be called more than once");
-
-        NativeString nativeExpr = (NativeString)expr;
-        QueryContext.Strings.Add(nativeExpr);
-
-        Desc.expr = nativeExpr;
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided value.
-    /// </summary>
-    /// <param name="term"></param>
-    /// <returns></returns>
-    public ref QueryBuilder With(Term term)
-    {
-        Term();
-        CurrentTerm = term.Value;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided id.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref QueryBuilder With(ulong id)
-    {
-        Term();
-        SetTermId(id);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder With(string name)
-    {
-        Term();
-        SetTermId();
-        First(name);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder With(ulong first, ulong second)
-    {
-        Term();
-        SetTermId(first, second);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder With(ulong first, string second)
-    {
-        Term();
-        SetTermId(first);
-        Second(second);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder With(string first, ulong second)
-    {
-        Term();
-        SetTermId();
-        First(first);
-        Second(second);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder With(string first, string second)
-    {
-        Term();
-        SetTermId();
-        First(first);
-        Second(second);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<T>()
-    {
-        Term();
-        SetTermId(Type<T>.Id(World));
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided enum.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<T>(T value) where T : Enum
-    {
-        return ref With<T>(Type<T>.Id(World, value));
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<TFirst>(ulong second)
-    {
-        return ref With(Type<TFirst>.Id(World), second);
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<TFirst>(string second)
-    {
-        return ref With(Type<TFirst>.Id(World)).Second(second);
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<TFirst, TSecond>()
-    {
-        return ref With<TFirst>(Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref With<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref WithSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        return ref With(Type<TFirst>.Id(World, first), second);
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        return ref With(first, Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder WithSecond<TSecond>(ulong first)
-    {
-        ulong pair = Ecs.PairSecond<TSecond>(first, World);
-        return ref With(pair);
-    }
-
-    /// <summary>
-    ///     Increments to the next term with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder WithSecond<TSecond>(string first)
-    {
-        return ref With(first, Type<TSecond>.Id(World));
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="term"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Without(Term term)
-    {
-        return ref With(term).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Without(ulong id)
-    {
-        return ref With(id).Not();
-    }
-
-    /// <summary>
-    ///    Alternative form of With().Not().
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Without(string name)
-    {
-        return ref With(name).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Without(ulong first, ulong second)
-    {
-        return ref With(first, second).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Without(ulong first, string second)
-    {
-        return ref With(first, second).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Without(string first, ulong second)
-    {
-        return ref With(first, second).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Without(string first, string second)
-    {
-        return ref With(first, second).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<T>()
-    {
-        return ref With<T>().Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<T>(T value) where T : Enum
-    {
-        return ref With(value).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<TFirst>(ulong second)
-    {
-        return ref With<TFirst>(second).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<TFirst>(string second)
-    {
-        return ref With<TFirst>(second).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<TFirst, TSecond>()
-    {
-        return ref With<TFirst, TSecond>().Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Without<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref WithoutSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        return ref Without(Type<TFirst>.Id(World, first), second);
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        return ref Without(first, Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Alternative form of WithSecond().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder WithoutSecond<TSecond>(ulong first)
-    {
-        return ref WithSecond<TSecond>(first).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of WithSecond().Not().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder WithoutSecond<TSecond>(string first)
-    {
-        return ref WithSecond<TSecond>(first).Not();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="term"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Write(Term term)
-    {
-        return ref With(term).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Write(ulong id)
-    {
-        return ref With(id).Write();
-    }
-
-    /// <summary>
-    ///    Alternative form of With().Write().
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Write(string name)
-    {
-        return ref With(name).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Write(ulong first, ulong second)
-    {
-        return ref With(first, second).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Write(ulong first, string second)
-    {
-        return ref With(first, second).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Write(string first, ulong second)
-    {
-        return ref With(first, second).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Write(string first, string second)
-    {
-        return ref With(first, second).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<T>()
-    {
-        return ref With<T>().Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<T>(T value) where T : Enum
-    {
-        return ref With(value).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<TFirst>(ulong second)
-    {
-        return ref With<TFirst>(second).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<TFirst>(string second)
-    {
-        return ref With<TFirst>(second).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<TFirst, TSecond>()
-    {
-        return ref With<TFirst, TSecond>().Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Write<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref WriteSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        return ref Write(Type<TFirst>.Id(World, first), second);
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        return ref Write(first, Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Alternative form of WithSecond().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder WriteSecond<TSecond>(ulong first)
-    {
-        return ref WithSecond<TSecond>(first).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of WithSecond().Write().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder WriteSecond<TSecond>(string first)
-    {
-        return ref WithSecond<TSecond>(first).Write();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="term"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Read(Term term)
-    {
-        return ref With(term).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Read(ulong id)
-    {
-        return ref With(id).Read();
-    }
-
-    /// <summary>
-    ///    Alternative form of With().Read().
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Read(string name)
-    {
-        return ref With(name).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Read(ulong first, ulong second)
-    {
-        return ref With(first, second).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Read(ulong first, string second)
-    {
-        return ref With(first, second).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Read(string first, ulong second)
-    {
-        return ref With(first, second).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public ref QueryBuilder Read(string first, string second)
-    {
-        return ref With(first, second).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<T>()
-    {
-        return ref With<T>().Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<T>(T value) where T : Enum
-    {
-        return ref With(value).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<TFirst>(ulong second)
-    {
-        return ref With<TFirst>(second).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<TFirst>(string second)
-    {
-        return ref With<TFirst>(second).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<TFirst, TSecond>()
-    {
-        return ref With<TFirst, TSecond>().Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Read<TFirst>(Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref ReadSecond<TSecond>(Type<TFirst>.Id(World, first));
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        return ref Read(Type<TFirst>.Id(World, first), second);
-    }
-
-    /// <summary>
-    ///     Alternative form of With().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        return ref Read(first, Type<TSecond>.Id(World, second));
-    }
-
-    /// <summary>
-    ///     Alternative form of WithSecond().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder ReadSecond<TSecond>(ulong first)
-    {
-        return ref WithSecond<TSecond>(first).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of WithSecond().Read().
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder ReadSecond<TSecond>(string first)
-    {
-        return ref WithSecond<TSecond>(first).Read();
-    }
-
-    /// <summary>
-    ///     Alternative form of With(EcsScopeOpen).Entity(0)
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder ScopeOpen()
-    {
-        return ref With(EcsScopeOpen).Entity(0);
-    }
-
-    /// <summary>
-    ///     Alternative form of With(EcsScopeClose).Entity(0)
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder ScopeClose()
-    {
-        return ref With(EcsScopeClose).Entity(0);
-    }
-
-    /// <summary>
-    ///     Term notation for more complex query features.
-    /// </summary>
-    /// <returns></returns>
-    public ref QueryBuilder Term()
-    {
-        Ecs.Assert(_termIndex < FLECS_TERM_COUNT_MAX, "Cannot have more than 32 terms.");
-        _termIndex = _termCount++;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets the current term to the one with the provided type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder TermAt<T>()
-    {
-        for (int i = 0; i < _termCount; i++)
-        {
-            ecs_term_t term = _desc.terms[i];
-            if (Ecs.TypeIdIs<T>(World, term.id) || Ecs.TypeIdIs<T>(World, Ecs.Pair(term.first.id, term.second.id)))
-                return ref TermAt(i);
-        }
-        Ecs.Error("Term not found.");
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets the current term to the one at the provided index.
-    /// </summary>
-    /// <param name="termIndex"></param>
-    /// <returns></returns>
-    public ref QueryBuilder TermAt(int termIndex)
-    {
-        Ecs.Assert(termIndex >= 0 && termIndex < FLECS_TERM_COUNT_MAX, "TermIndex argument must be between 0-31.");
-
-        _termIndex = termIndex;
-        _termIdType = TermIdType.Src;
-
-        fixed (ecs_term_t* ptr = &CurrentTerm)
-            Ecs.Assert(ecs_term_is_initialized(ptr), "Term is not initialized.");
-
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets the current term to the one at the provided index and asserts that the type matches.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder TermAt<T>(int termIndex)
-    {
-        Ecs.Assert(Ecs.TypeIdIs<T>(World, CurrentTerm.id) || Ecs.TypeIdIs<T>(World, Ecs.Pair(CurrentTerm.first.id, CurrentTerm.second.id)), "Term type does not match.");
-        return ref TermAt(termIndex);
-    }
-
-    /// <summary>
-    ///     Sort the output of a query.
-    /// </summary>
-    /// <param name="component"></param>
-    /// <param name="callback"></param>
-    /// <returns></returns>
-    public ref QueryBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        QueryContext.OrderBy.Set(callback, null);
-        Desc.order_by_callback = (delegate* unmanaged<ulong, void*, ulong, void*, int>)Marshal.GetFunctionPointerForDelegate(callback);
-        Desc.order_by = component;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sort the output of a query.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        return ref OrderBy(Type<T>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     Group and sort matched tables.
-    /// </summary>
-    /// <param name="component">The id to be used for grouping.</param>
-    /// <returns></returns>
-    public ref QueryBuilder GroupBy(ulong component)
-    {
-        Desc.group_by_callback = default;
-        Desc.group_by = component;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Group and sort matched tables.
-    /// </summary>
-    /// <param name="component">The id to be used for grouping.</param>
-    /// <param name="callback">The callback.</param>
-    /// <returns></returns>
-    public ref QueryBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        GroupByContext.GroupBy.Set(callback, (delegate*<ecs_world_t*, ecs_table_t*, ulong, GroupByContext*, ulong>)&Functions.GroupByCallbackDelegate);
-        Desc.group_by_callback = &Functions.GroupByCallback;
-        Desc.group_by = component;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Group and sort matched tables.
-    /// </summary>
-    /// <param name="component">The id to be used for grouping</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TContext">The user context type.</typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        GroupByContext.GroupBy.Set(callback, (delegate*<ecs_world_t*, ecs_table_t*, ulong, GroupByContext*, ulong>)&Functions.GroupByCallbackDelegate<TContext>);
-        Desc.group_by_callback = &Functions.GroupByCallback;
-        Desc.group_by = component;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Group and sort matched tables.
-    /// </summary>
-    /// <typeparam name="T">The component to be used for grouping.</typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder GroupBy<T>()
-    {
-        return ref GroupBy(Type<T>.Id(World));
-    }
-
-    /// <summary>
-    ///     Group and sort matched tables.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The component to be used for grouping.</typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        return ref GroupBy(Type<T>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     Group and sort matched tables.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The component to be used for grouping.</typeparam>
-    /// <typeparam name="TContext">The user context type.</typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        return ref GroupBy(Type<T>.Id(World), callback);
-    }
-
-    /// <summary>
-    ///     Sets the group by user context object.
-    /// </summary>
-    /// <param name="value">The user context object.</param>
-    /// <typeparam name="T">The user context type.</typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder GroupByCtx<T>(T value)
-    {
-        GroupByContext.GroupByUserContext.Set(ref value);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets the group by user context object. The provided callback will be run before the
-    ///     user context object is released by flecs.
-    /// </summary>
-    /// <param name="value">The user context object.</param>
-    /// <param name="callback">The callback.</param>
-    /// <returns></returns>
-    public ref QueryBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        GroupByContext.GroupByUserContext.Set(ref value, callback);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Sets the group by user context object. The provided callback will be run before the
-    ///     user context object is released by flecs.
-    /// </summary>
-    /// <param name="value">The user context object.</param>
-    /// <param name="callback">The callback.</param>
-    /// <returns></returns>
-    public ref QueryBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        GroupByContext.GroupByUserContext.Set(ref value, callback);
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify callback to run when a group is created.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <returns></returns>
-    public ref QueryBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        GroupByContext.GroupCreate.Set(callback, (delegate*<ecs_world_t*, ulong, GroupByContext*, void*>)&Functions.GroupCreateCallbackDelegate);
-        Desc.on_group_create = &Functions.GroupCreateCallback;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify callback to run when a group is created.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The user context type.</typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        GroupByContext.GroupCreate.Set(callback, (delegate*<ecs_world_t*, ulong, GroupByContext*, void*>)&Functions.GroupCreateCallbackDelegate<T>);
-        Desc.on_group_create = &Functions.GroupCreateCallback;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify callback to run when a group is deleted.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <returns></returns>
-    public ref QueryBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        GroupByContext.GroupDelete.Set(callback, (delegate*<ecs_world_t*, ulong, UserContext*, GroupByContext*, void>)&Functions.GroupDeleteCallbackDelegate);
-        Desc.on_group_delete = &Functions.GroupDeleteCallback;
-        return ref this;
-    }
-
-    /// <summary>
-    ///     Specify callback to run when a group is deleted.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The user context type.</typeparam>
-    /// <returns></returns>
-    public ref QueryBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        GroupByContext.GroupDelete.Set(callback, (delegate*<ecs_world_t*, ulong, UserContext*, GroupByContext*, void>)&Functions.GroupDeleteCallbackDelegate<T>);
-        Desc.on_group_delete = &Functions.GroupDeleteCallback;
-        return ref this;
-    }
-
-    private QueryContext* EnsureQueryContext()
-    {
-        if (_desc.binding_ctx != null)
-            return (QueryContext*)_desc.binding_ctx;
-
-        _desc.binding_ctx = Memory.AllocZeroed<QueryContext>(1);
-        _desc.binding_ctx_free = &Functions.QueryContextFree;
-        return (QueryContext*)_desc.binding_ctx;
-    }
-
-    private GroupByContext* EnsureGroupByContext()
-    {
-        if (_desc.group_by_ctx != null)
-            return (GroupByContext*)_desc.group_by_ctx;
-
-        _desc.group_by_ctx = Memory.AllocZeroed<GroupByContext>(1);
-        _desc.group_by_ctx_free = &Functions.GroupByContextFree;
-        return (GroupByContext*)_desc.group_by_ctx;
-    }
-
-    [Conditional("DEBUG")]
-    private void AssertTermId()
-    {
-        Ecs.Assert(!Unsafe.IsNullRef(ref CurrentTermId), "No active term (call .Term() first)");
-    }
-
-    [Conditional("DEBUG")]
-    private void AssertTerm()
-    {
-        Ecs.Assert(!Unsafe.IsNullRef(ref CurrentTermId), "No active term (call .term() first)");
-    }
-
-    private void SetTermId()
-    {
-        CurrentTerm = default;
-    }
-
-    private void SetTermId(ulong id)
-    {
-        CurrentTerm = (id & ECS_ID_FLAGS_MASK) == 0
-            ? new ecs_term_t { first = new ecs_term_ref_t { id = id } }
-            : new ecs_term_t { id = id };
-    }
-
-    private void SetTermId(ulong first, ulong second)
-    {
-        CurrentTerm = new ecs_term_t { id = Ecs.Pair(first, second) };
-    }
-
-    private enum TermIdType
-    {
-        Src,
-        First,
-        Second
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="QueryBuilder"/> instances are equal.
-    /// </summary>
-    /// <param name="other"></param>
-    /// <returns></returns>
-    public bool Equals(QueryBuilder other)
-    {
-        return Desc == other.Desc;
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="QueryBuilder"/> instances are equal.
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    public override bool Equals(object? obj)
-    {
-        return obj is QueryBuilder other && Equals(other);
-    }
-
-    /// <summary>
-    ///     Returns the hash code for the <see cref="EventBuilder"/>.
-    /// </summary>
-    /// <returns></returns>
-    public override int GetHashCode()
-    {
-        return Desc.GetHashCode();
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="QueryBuilder"/> instances are equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator ==(QueryBuilder left, QueryBuilder right)
-    {
-        return left.Equals(right);
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="QueryBuilder"/> instances are not equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator !=(QueryBuilder left, QueryBuilder right)
-    {
-        return !(left == right);
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Flecs.NET.Core.BindingContext;
+using Flecs.NET.Utilities;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+/// <summary>
+///     A wrapper around <see cref="ecs_query_desc_t"/>.
+/// </summary>
+public unsafe struct QueryBuilder : IDisposable, IEquatable<QueryBuilder>, IQueryBuilder<QueryBuilder, Query>
+{
+    private ecs_world_t* _world;
+    private ecs_query_desc_t _desc;
+    private int _termIndex;
+    private int _termCount;
+    private TermIdType _termIdType;
+    private ref ecs_term_t CurrentTerm => ref Desc.terms[_termIndex];
+    private ref ecs_term_ref_t CurrentTermId
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get
+        {
+            switch (_termIdType)
+            {
+                case TermIdType.First:
+                    return ref CurrentTerm.first;
+                case TermIdType.Second:
+                    return ref CurrentTerm.second;
+                case TermIdType.Src:
+                    return ref CurrentTerm.src;
+                default:
+                    return ref Unsafe.NullRef<ecs_term_ref_t>();
+            }
+        }
+    }
+
+    internal ref QueryContext QueryContext => ref *EnsureQueryContext();
+    internal ref GroupByContext GroupByContext => ref *EnsureGroupByContext();
+
+    ref QueryBuilder IQueryBuilderBase.QueryBuilder => ref this;
+
+    /// <summary>
+    ///     A reference to the world.
+    /// </summary>
+    public ref ecs_world_t* World => ref _world;
+
+    /// <summary>
+    ///     A reference to the query description.
+    /// </summary>
+    public ref ecs_query_desc_t Desc => ref _desc;
+
+    /// <summary>
+    ///     Creates a query builder for the provided world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    public QueryBuilder(ecs_world_t* world)
+    {
+        _world = world;
+        _desc = default;
+        _termIndex = default;
+        _termCount = default;
+        _termIdType = TermIdType.Src;
+        QueryContext = default;
+    }
+
+    /// <summary>
+    ///     Creates a query builder for the provided world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="entity">The query entity.</param>
+    public QueryBuilder(ecs_world_t* world, ulong entity) : this(world)
+    {
+        Desc.entity = entity;
+    }
+
+    /// <summary>
+    ///     Creates a query builder for the provided world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="name">The query name.</param>
+    public QueryBuilder(ecs_world_t* world, string name) : this(world)
+    {
+        if (string.IsNullOrEmpty(name))
+            return;
+
+        using NativeString nativeName = (NativeString)name;
+
+        ecs_entity_desc_t desc = default;
+        desc.name = nativeName;
+        desc.sep = Pointers.DefaultSeparator;
+        desc.root_sep = Pointers.DefaultSeparator;
+        Desc.entity = ecs_entity_init(World, &desc);
+    }
+
+    /// <summary>
+    ///     Cleans up native resources. This should be called if the query builder
+    ///     will be discarded and .Build() isn't called.
+    /// </summary>
+    public void Dispose()
+    {
+        QueryContext.Free(ref QueryContext);
+        GroupByContext.Free(ref GroupByContext);
+        this = default;
+    }
+
+    /// <summary>
+    ///     Builds a new Query.
+    /// </summary>
+    /// <returns></returns>
+    public Query Build()
+    {
+        fixed (ecs_query_desc_t* ptr = &Desc)
+            return new Query(ecs_query_init(World, ptr));
+    }
+
+    /// <summary>
+    ///     The self flags indicates the term identifier itself is used.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Self()
+    {
+        AssertTermId();
+        CurrentTermId.id |= EcsSelf;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify value of identifier by id.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Id(ulong id)
+    {
+        AssertTermId();
+        CurrentTermId.id = id;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify value of identifier by id. Almost the same as id(entity), but this
+    ///     operation explicitly sets the EcsIsEntity flag. This forces the id to
+    ///     be interpreted as entity, whereas not setting the flag would implicitly
+    ///     convert ids for builtin variables such as EcsThis to a variable.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Entity(ulong entity)
+    {
+        AssertTermId();
+        CurrentTermId.id = entity | EcsIsEntity;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify value of identifier by name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Name(string name)
+    {
+        AssertTermId();
+
+        NativeString nativeName = (NativeString)name;
+        QueryContext.Strings.Add(nativeName);
+
+        CurrentTermId.id |= EcsIsEntity;
+        CurrentTermId.name = nativeName;
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify identifier is a variable (resolved at query evaluation time).
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Var(string name)
+    {
+        AssertTermId();
+
+        NativeString nativeName = (NativeString)name;
+        QueryContext.Strings.Add(nativeName);
+
+        CurrentTermId.id |= EcsIsVariable;
+        CurrentTermId.name = nativeName;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets term id.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Term(ulong id)
+    {
+        return ref Id(id);
+    }
+
+    /// <summary>
+    ///     Call prior to setting values for src identifier.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Src()
+    {
+        AssertTerm();
+        _termIdType = TermIdType.Src;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Call prior to setting values for first identifier. This is either the
+    ///     component identifier, or first element of a pair (in case second is
+    ///     populated as well).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder First()
+    {
+        AssertTerm();
+        _termIdType = TermIdType.First;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Call prior to setting values for second identifier. This is the second
+    ///     element of a pair. Requires that First() is populated as well.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Second()
+    {
+        AssertTerm();
+        _termIdType = TermIdType.Second;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Select src identifier, initialize it with entity id.
+    /// </summary>
+    /// <param name="srcId"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Src(ulong srcId)
+    {
+        return ref Src().Id(srcId);
+    }
+
+    /// <summary>
+    ///     Select src identifier, initialize it with id associated with type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Src<T>()
+    {
+        return ref Src(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Select src identifier, initialize it with id associated with enum member.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Src<T>(T value) where T : Enum
+    {
+        return ref Src(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Select src identifier, initialize it with name. If name starts with a $
+    ///     the name is interpreted as a variable.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Src(string name)
+    {
+        Src();
+        return ref name[0] == '$' ? ref Var(name[1..]) : ref Name(name);
+    }
+
+    /// <summary>
+    ///     Select first identifier, initialize it with entity id.
+    /// </summary>
+    /// <param name="firstId"></param>
+    /// <returns></returns>
+    public ref QueryBuilder First(ulong firstId)
+    {
+        return ref First().Id(firstId);
+    }
+
+    /// <summary>
+    ///     Select first identifier, initialize it with id associated with type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder First<T>()
+    {
+        return ref First(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Select first identifier, initialize it with id associated with enum member.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder First<T>(T value) where T : Enum
+    {
+        return ref First(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Select first identifier, initialize it with name. If name starts with a $
+    ///     the name is interpreted as a variable.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder First(string name)
+    {
+        First();
+        return ref name[0] == '$' ? ref Var(name[1..]) : ref Name(name);
+    }
+
+    /// <summary>
+    ///     Select second identifier, initialize it with entity id.
+    /// </summary>
+    /// <param name="secondId"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Second(ulong secondId)
+    {
+        return ref Second().Id(secondId);
+    }
+
+    /// <summary>
+    ///     Select second identifier, initialize it with id associated with type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Second<T>()
+    {
+        return ref Second(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Select second identifier, initialize it with id associated with enum member.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Second<T>(T value) where T : Enum
+    {
+        return ref Second(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Select second identifier, initialize it with name. If name starts with a $
+    ///     the name is interpreted as a variable.
+    /// </summary>
+    /// <param name="secondName"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Second(string secondName)
+    {
+        Second();
+        return ref secondName[0] == '$' ? ref Var(secondName[1..]) : ref Name(secondName);
+    }
+
+    /// <summary>
+    ///     The up flag indicates that the term identifier may be substituted by
+    ///     traversing a relationship upwards. For example: substitute the identifier
+    ///     with its parent by traversing the ChildOf relationship.
+    /// </summary>
+    /// <param name="traverse"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Up(ulong traverse = 0)
+    {
+        AssertTermId();
+        Ecs.Assert(_termIdType == TermIdType.Src, "Up traversal can only be applied to term source.");
+
+        CurrentTermId.id |= EcsUp;
+
+        if (traverse != 0)
+            CurrentTerm.trav = traverse;
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     The up flag indicates that the term identifier may be substituted by
+    ///     traversing a relationship upwards. For example: substitute the identifier
+    ///     with its parent by traversing the ChildOf relationship.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Up<T>()
+    {
+        return ref Up(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     The up flag indicates that the term identifier may be substituted by
+    ///     traversing a relationship upwards. For example: substitute the identifier
+    ///     with its parent by traversing the ChildOf relationship.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Up<T>(T value) where T : Enum
+    {
+        return ref Up(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     The cascade flag is like up, but returns results in breadth-first order.
+    ///     Only supported for Query.
+    /// </summary>
+    /// <param name="traverse"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Cascade(ulong traverse = 0)
+    {
+        AssertTermId();
+
+        Up();
+        CurrentTermId.id |= EcsCascade;
+
+        if (traverse != 0)
+            CurrentTerm.trav = traverse;
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     The cascade flag is like up, but returns results in breadth-first order.
+    ///     Only supported for Query.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Cascade<T>()
+    {
+        return ref Cascade(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     The cascade flag is like up, but returns results in breadth-first order.
+    ///     Only supported for Query.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Cascade<T>(T value) where T : Enum
+    {
+        return ref Cascade(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Use with cascade to iterate results in descending (bottom -> top) order
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Descend()
+    {
+        AssertTermId();
+        CurrentTermId.id |= EcsDesc;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Same as up(), exists for backwards compatibility.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Parent()
+    {
+        return ref Up();
+    }
+
+    /// <summary>
+    ///     Specify relationship to traverse, and flags to indicate direction.
+    /// </summary>
+    /// <param name="traverse"></param>
+    /// <param name="flags"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Trav(ulong traverse, uint flags = 0)
+    {
+        AssertTermId();
+        CurrentTerm.trav = traverse;
+        CurrentTermId.id |= flags;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify relationship to traverse, and flags to indicate direction.
+    /// </summary>
+    /// <param name="flags"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Trav<T>(uint flags = 0)
+    {
+        return ref Trav(Type<T>.Id(World), flags);
+    }
+
+    /// <summary>
+    ///     Specify relationship to traverse, and flags to indicate direction.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="flags"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        return ref Trav(Type<T>.Id(World, value), flags);
+    }
+
+    /// <summary>
+    ///     Set id flags for term.
+    /// </summary>
+    /// <param name="flags"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Flags(ulong flags)
+    {
+        AssertTerm();
+        CurrentTerm.id |= flags;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set read/write access of term.
+    /// </summary>
+    /// <param name="inOut"></param>
+    /// <returns></returns>
+    public ref QueryBuilder InOut(ecs_inout_kind_t inOut)
+    {
+        AssertTerm();
+        CurrentTerm.inout = (short)inOut;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set read/write access for stage. Use this when a system reads or writes
+    ///     components other than the ones provided by the query. This information
+    ///     can be used by schedulers to insert sync/merge points between systems
+    ///     where deferred operations are flushed.
+    ///     Setting this is optional. If not set, the value of the accessed component
+    ///     may be out of sync for at most one frame.
+    /// </summary>
+    /// <param name="inOut"></param>
+    /// <returns></returns>
+    public ref QueryBuilder InOutStage(ecs_inout_kind_t inOut)
+    {
+        AssertTerm();
+        CurrentTerm.inout = (short)inOut;
+        if (CurrentTerm.oper != (short)EcsNot)
+            Src().Entity(0);
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Short for InOutStage(EcsOut).
+    ///     Use when system uses add, remove or set.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Write()
+    {
+        return ref InOutStage(EcsOut);
+    }
+
+    /// <summary>
+    ///     Short for InOutStage(EcsIn).
+    ///     Use when system uses get.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Read()
+    {
+        return ref InOutStage(EcsIn);
+    }
+
+    /// <summary>
+    ///     Short for InOutStage(EcsInOut).
+    ///     Use when system uses get_mut.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder ReadWrite()
+    {
+        return ref InOutStage(EcsInOut);
+    }
+
+    /// <summary>
+    ///     Short for InOut(EcsIn)
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder In()
+    {
+        return ref InOut(EcsIn);
+    }
+
+    /// <summary>
+    ///     Short for InOut(EcsOut)
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Out()
+    {
+        return ref InOut(EcsOut);
+    }
+
+    /// <summary>
+    ///     Short for InOut(EcsInOut)
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder InOut()
+    {
+        return ref InOut(EcsInOut);
+    }
+
+    /// <summary>
+    ///     Short for InOut(EcsInOutNone)
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder InOutNone()
+    {
+        return ref InOut(EcsInOutNone);
+    }
+
+    /// <summary>
+    ///     Set operator of term.
+    /// </summary>
+    /// <param name="oper"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Oper(ecs_oper_kind_t oper)
+    {
+        AssertTerm();
+        CurrentTerm.oper = (short)oper;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Short for Oper(EcsAnd).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder And()
+    {
+        return ref Oper(EcsAnd);
+    }
+
+    /// <summary>
+    ///     Short for Oper(EcsOr).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Or()
+    {
+        return ref Oper(EcsOr);
+    }
+
+    /// <summary>
+    ///     Short for Oper(EcsNot).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Not()
+    {
+        return ref Oper(EcsNot);
+    }
+
+    /// <summary>
+    ///     Short for Oper(EcsOptional).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Optional()
+    {
+        return ref Oper(EcsOptional);
+    }
+
+
+    /// <summary>
+    ///     Short for Oper(EcsAndFrom).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder AndFrom()
+    {
+        return ref Oper(EcsAndFrom);
+    }
+
+    /// <summary>
+    ///     Short for Oper(EcsOFrom).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder OrFrom()
+    {
+        return ref Oper(EcsOrFrom);
+    }
+
+    /// <summary>
+    ///     Short for Oper(EcsNotFrom).
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder NotFrom()
+    {
+        return ref Oper(EcsNotFrom);
+    }
+
+    /// <summary>
+    ///     Match singleton.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Singleton()
+    {
+        AssertTerm();
+        Ecs.Assert(CurrentTerm.id != 0 || CurrentTerm.first.id != 0, "no component specified for singleton");
+
+        ulong singletonId = CurrentTerm.id;
+
+        if (singletonId == 0)
+            singletonId = CurrentTerm.first.id;
+
+        Ecs.Assert(singletonId != 0, nameof(ECS_INVALID_PARAMETER));
+        CurrentTerm.src.id = !Ecs.IsPair(singletonId) ? singletonId : Ecs.PairFirst(World, singletonId);
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Filter terms are not triggered on by observers.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Filter()
+    {
+        CurrentTerm.inout = (short)EcsInOutFilter;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Set query flags for advanced usage
+    /// </summary>
+    /// <param name="flags"></param>
+    /// <returns></returns>
+    public ref QueryBuilder QueryFlags(uint flags)
+    {
+        Desc.flags |= flags;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets the cache kind.
+    /// </summary>
+    /// <param name="kind"></param>
+    /// <returns></returns>
+    public ref QueryBuilder CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Desc.cache_kind = kind;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Cache query terms that are cacheable.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Cached()
+    {
+        return ref CacheKind(EcsQueryCacheAuto);
+    }
+
+    /// <summary>
+    ///     Query expression. Should not be set at the same time as terms array.
+    /// </summary>
+    /// <param name="expr"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Expr(string expr)
+    {
+        Ecs.Assert(Desc.expr == null, "QueryBuilder.Expr() cannot be called more than once");
+
+        NativeString nativeExpr = (NativeString)expr;
+        QueryContext.Strings.Add(nativeExpr);
+
+        Desc.expr = nativeExpr;
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided value.
+    /// </summary>
+    /// <param name="term"></param>
+    /// <returns></returns>
+    public ref QueryBuilder With(Term term)
+    {
+        Term();
+        CurrentTerm = term.Value;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided id.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref QueryBuilder With(ulong id)
+    {
+        Term();
+        SetTermId(id);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder With(string name)
+    {
+        Term();
+        SetTermId();
+        First(name);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder With(ulong first, ulong second)
+    {
+        Term();
+        SetTermId(first, second);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder With(ulong first, string second)
+    {
+        Term();
+        SetTermId(first);
+        Second(second);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder With(string first, ulong second)
+    {
+        Term();
+        SetTermId();
+        First(first);
+        Second(second);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder With(string first, string second)
+    {
+        Term();
+        SetTermId();
+        First(first);
+        Second(second);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<T>()
+    {
+        Term();
+        SetTermId(Type<T>.Id(World));
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided enum.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<T>(T value) where T : Enum
+    {
+        return ref With<T>(Type<T>.Id(World, value));
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<TFirst>(ulong second)
+    {
+        return ref With(Type<TFirst>.Id(World), second);
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<TFirst>(string second)
+    {
+        return ref With(Type<TFirst>.Id(World)).Second(second);
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<TFirst, TSecond>()
+    {
+        return ref With<TFirst>(Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref With<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref WithSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        return ref With(Type<TFirst>.Id(World, first), second);
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        return ref With(first, Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder WithSecond<TSecond>(ulong first)
+    {
+        ulong pair = Ecs.PairSecond<TSecond>(first, World);
+        return ref With(pair);
+    }
+
+    /// <summary>
+    ///     Increments to the next term with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder WithSecond<TSecond>(string first)
+    {
+        return ref With(first, Type<TSecond>.Id(World));
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="term"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Without(Term term)
+    {
+        return ref With(term).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Without(ulong id)
+    {
+        return ref With(id).Not();
+    }
+
+    /// <summary>
+    ///    Alternative form of With().Not().
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Without(string name)
+    {
+        return ref With(name).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Without(ulong first, ulong second)
+    {
+        return ref With(first, second).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Without(ulong first, string second)
+    {
+        return ref With(first, second).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Without(string first, ulong second)
+    {
+        return ref With(first, second).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Without(string first, string second)
+    {
+        return ref With(first, second).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<T>()
+    {
+        return ref With<T>().Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<T>(T value) where T : Enum
+    {
+        return ref With(value).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<TFirst>(ulong second)
+    {
+        return ref With<TFirst>(second).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<TFirst>(string second)
+    {
+        return ref With<TFirst>(second).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<TFirst, TSecond>()
+    {
+        return ref With<TFirst, TSecond>().Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Without<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref WithoutSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        return ref Without(Type<TFirst>.Id(World, first), second);
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        return ref Without(first, Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Alternative form of WithSecond().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder WithoutSecond<TSecond>(ulong first)
+    {
+        return ref WithSecond<TSecond>(first).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of WithSecond().Not().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder WithoutSecond<TSecond>(string first)
+    {
+        return ref WithSecond<TSecond>(first).Not();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="term"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Write(Term term)
+    {
+        return ref With(term).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Write(ulong id)
+    {
+        return ref With(id).Write();
+    }
+
+    /// <summary>
+    ///    Alternative form of With().Write().
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Write(string name)
+    {
+        return ref With(name).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Write(ulong first, ulong second)
+    {
+        return ref With(first, second).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Write(ulong first, string second)
+    {
+        return ref With(first, second).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Write(string first, ulong second)
+    {
+        return ref With(first, second).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Write(string first, string second)
+    {
+        return ref With(first, second).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<T>()
+    {
+        return ref With<T>().Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<T>(T value) where T : Enum
+    {
+        return ref With(value).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<TFirst>(ulong second)
+    {
+        return ref With<TFirst>(second).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<TFirst>(string second)
+    {
+        return ref With<TFirst>(second).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<TFirst, TSecond>()
+    {
+        return ref With<TFirst, TSecond>().Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Write<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref WriteSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        return ref Write(Type<TFirst>.Id(World, first), second);
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        return ref Write(first, Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Alternative form of WithSecond().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder WriteSecond<TSecond>(ulong first)
+    {
+        return ref WithSecond<TSecond>(first).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of WithSecond().Write().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder WriteSecond<TSecond>(string first)
+    {
+        return ref WithSecond<TSecond>(first).Write();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="term"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Read(Term term)
+    {
+        return ref With(term).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Read(ulong id)
+    {
+        return ref With(id).Read();
+    }
+
+    /// <summary>
+    ///    Alternative form of With().Read().
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Read(string name)
+    {
+        return ref With(name).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Read(ulong first, ulong second)
+    {
+        return ref With(first, second).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Read(ulong first, string second)
+    {
+        return ref With(first, second).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Read(string first, ulong second)
+    {
+        return ref With(first, second).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public ref QueryBuilder Read(string first, string second)
+    {
+        return ref With(first, second).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<T>()
+    {
+        return ref With<T>().Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<T>(T value) where T : Enum
+    {
+        return ref With(value).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<TFirst>(ulong second)
+    {
+        return ref With<TFirst>(second).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<TFirst>(string second)
+    {
+        return ref With<TFirst>(second).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<TFirst, TSecond>()
+    {
+        return ref With<TFirst, TSecond>().Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Read<TFirst>(Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref ReadSecond<TSecond>(Type<TFirst>.Id(World, first));
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        return ref Read(Type<TFirst>.Id(World, first), second);
+    }
+
+    /// <summary>
+    ///     Alternative form of With().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        return ref Read(first, Type<TSecond>.Id(World, second));
+    }
+
+    /// <summary>
+    ///     Alternative form of WithSecond().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder ReadSecond<TSecond>(ulong first)
+    {
+        return ref WithSecond<TSecond>(first).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of WithSecond().Read().
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder ReadSecond<TSecond>(string first)
+    {
+        return ref WithSecond<TSecond>(first).Read();
+    }
+
+    /// <summary>
+    ///     Alternative form of With(EcsScopeOpen).Entity(0)
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder ScopeOpen()
+    {
+        return ref With(EcsScopeOpen).Entity(0);
+    }
+
+    /// <summary>
+    ///     Alternative form of With(EcsScopeClose).Entity(0)
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder ScopeClose()
+    {
+        return ref With(EcsScopeClose).Entity(0);
+    }
+
+    /// <summary>
+    ///     Term notation for more complex query features.
+    /// </summary>
+    /// <returns></returns>
+    public ref QueryBuilder Term()
+    {
+        Ecs.Assert(_termIndex < FLECS_TERM_COUNT_MAX, "Cannot have more than 32 terms.");
+        _termIndex = _termCount++;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets the current term to the one with the provided type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder TermAt<T>()
+    {
+        for (int i = 0; i < _termCount; i++)
+        {
+            ecs_term_t term = _desc.terms[i];
+            if (Ecs.TypeIdIs<T>(World, term.id) || Ecs.TypeIdIs<T>(World, Ecs.Pair(term.first.id, term.second.id)))
+                return ref TermAt(i);
+        }
+        Ecs.Error("Term not found.");
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets the current term to the one at the provided index.
+    /// </summary>
+    /// <param name="termIndex"></param>
+    /// <returns></returns>
+    public ref QueryBuilder TermAt(int termIndex)
+    {
+        Ecs.Assert(termIndex >= 0 && termIndex < FLECS_TERM_COUNT_MAX, "TermIndex argument must be between 0-31.");
+
+        _termIndex = termIndex;
+        _termIdType = TermIdType.Src;
+
+        fixed (ecs_term_t* ptr = &CurrentTerm)
+            Ecs.Assert(ecs_term_is_initialized(ptr), "Term is not initialized.");
+
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets the current term to the one at the provided index and asserts that the type matches.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder TermAt<T>(int termIndex)
+    {
+        Ecs.Assert(Ecs.TypeIdIs<T>(World, CurrentTerm.id) || Ecs.TypeIdIs<T>(World, Ecs.Pair(CurrentTerm.first.id, CurrentTerm.second.id)), "Term type does not match.");
+        return ref TermAt(termIndex);
+    }
+
+    /// <summary>
+    ///     Sort the output of a query.
+    /// </summary>
+    /// <param name="component"></param>
+    /// <param name="callback"></param>
+    /// <returns></returns>
+    public ref QueryBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        QueryContext.OrderBy.Set(callback, null);
+        Desc.order_by_callback = (delegate* unmanaged<ulong, void*, ulong, void*, int>)Marshal.GetFunctionPointerForDelegate(callback);
+        Desc.order_by = component;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sort the output of a query.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        return ref OrderBy(Type<T>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     Group and sort matched tables.
+    /// </summary>
+    /// <param name="component">The id to be used for grouping.</param>
+    /// <returns></returns>
+    public ref QueryBuilder GroupBy(ulong component)
+    {
+        Desc.group_by_callback = default;
+        Desc.group_by = component;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Group and sort matched tables.
+    /// </summary>
+    /// <param name="component">The id to be used for grouping.</param>
+    /// <param name="callback">The callback.</param>
+    /// <returns></returns>
+    public ref QueryBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        GroupByContext.GroupBy.Set(callback, (delegate*<ecs_world_t*, ecs_table_t*, ulong, GroupByContext*, ulong>)&Functions.GroupByCallbackDelegate);
+        Desc.group_by_callback = &Functions.GroupByCallback;
+        Desc.group_by = component;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Group and sort matched tables.
+    /// </summary>
+    /// <param name="component">The id to be used for grouping</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TContext">The user context type.</typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        GroupByContext.GroupBy.Set(callback, (delegate*<ecs_world_t*, ecs_table_t*, ulong, GroupByContext*, ulong>)&Functions.GroupByCallbackDelegate<TContext>);
+        Desc.group_by_callback = &Functions.GroupByCallback;
+        Desc.group_by = component;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Group and sort matched tables.
+    /// </summary>
+    /// <typeparam name="T">The component to be used for grouping.</typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder GroupBy<T>()
+    {
+        return ref GroupBy(Type<T>.Id(World));
+    }
+
+    /// <summary>
+    ///     Group and sort matched tables.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The component to be used for grouping.</typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        return ref GroupBy(Type<T>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     Group and sort matched tables.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The component to be used for grouping.</typeparam>
+    /// <typeparam name="TContext">The user context type.</typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        return ref GroupBy(Type<T>.Id(World), callback);
+    }
+
+    /// <summary>
+    ///     Sets the group by user context object.
+    /// </summary>
+    /// <param name="value">The user context object.</param>
+    /// <typeparam name="T">The user context type.</typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder GroupByCtx<T>(T value)
+    {
+        GroupByContext.GroupByUserContext.Set(ref value);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets the group by user context object. The provided callback will be run before the
+    ///     user context object is released by flecs.
+    /// </summary>
+    /// <param name="value">The user context object.</param>
+    /// <param name="callback">The callback.</param>
+    /// <returns></returns>
+    public ref QueryBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        GroupByContext.GroupByUserContext.Set(ref value, callback);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Sets the group by user context object. The provided callback will be run before the
+    ///     user context object is released by flecs.
+    /// </summary>
+    /// <param name="value">The user context object.</param>
+    /// <param name="callback">The callback.</param>
+    /// <returns></returns>
+    public ref QueryBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        GroupByContext.GroupByUserContext.Set(ref value, callback);
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify callback to run when a group is created.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <returns></returns>
+    public ref QueryBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        GroupByContext.GroupCreate.Set(callback, (delegate*<ecs_world_t*, ulong, GroupByContext*, void*>)&Functions.GroupCreateCallbackDelegate);
+        Desc.on_group_create = &Functions.GroupCreateCallback;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify callback to run when a group is created.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The user context type.</typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        GroupByContext.GroupCreate.Set(callback, (delegate*<ecs_world_t*, ulong, GroupByContext*, void*>)&Functions.GroupCreateCallbackDelegate<T>);
+        Desc.on_group_create = &Functions.GroupCreateCallback;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify callback to run when a group is deleted.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <returns></returns>
+    public ref QueryBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        GroupByContext.GroupDelete.Set(callback, (delegate*<ecs_world_t*, ulong, UserContext*, GroupByContext*, void>)&Functions.GroupDeleteCallbackDelegate);
+        Desc.on_group_delete = &Functions.GroupDeleteCallback;
+        return ref this;
+    }
+
+    /// <summary>
+    ///     Specify callback to run when a group is deleted.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The user context type.</typeparam>
+    /// <returns></returns>
+    public ref QueryBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        GroupByContext.GroupDelete.Set(callback, (delegate*<ecs_world_t*, ulong, UserContext*, GroupByContext*, void>)&Functions.GroupDeleteCallbackDelegate<T>);
+        Desc.on_group_delete = &Functions.GroupDeleteCallback;
+        return ref this;
+    }
+
+    public ref QueryBuilder DetectChanges()
+    {
+        Desc.flags |= EcsQueryDetectChanges;
+        return ref this;
+    }
+
+    private QueryContext* EnsureQueryContext()
+    {
+        if (_desc.binding_ctx != null)
+            return (QueryContext*)_desc.binding_ctx;
+
+        _desc.binding_ctx = Memory.AllocZeroed<QueryContext>(1);
+        _desc.binding_ctx_free = &Functions.QueryContextFree;
+        return (QueryContext*)_desc.binding_ctx;
+    }
+
+    private GroupByContext* EnsureGroupByContext()
+    {
+        if (_desc.group_by_ctx != null)
+            return (GroupByContext*)_desc.group_by_ctx;
+
+        _desc.group_by_ctx = Memory.AllocZeroed<GroupByContext>(1);
+        _desc.group_by_ctx_free = &Functions.GroupByContextFree;
+        return (GroupByContext*)_desc.group_by_ctx;
+    }
+
+    [Conditional("DEBUG")]
+    private void AssertTermId()
+    {
+        Ecs.Assert(!Unsafe.IsNullRef(ref CurrentTermId), "No active term (call .Term() first)");
+    }
+
+    [Conditional("DEBUG")]
+    private void AssertTerm()
+    {
+        Ecs.Assert(!Unsafe.IsNullRef(ref CurrentTermId), "No active term (call .term() first)");
+    }
+
+    private void SetTermId()
+    {
+        CurrentTerm = default;
+    }
+
+    private void SetTermId(ulong id)
+    {
+        CurrentTerm = (id & ECS_ID_FLAGS_MASK) == 0
+            ? new ecs_term_t { first = new ecs_term_ref_t { id = id } }
+            : new ecs_term_t { id = id };
+    }
+
+    private void SetTermId(ulong first, ulong second)
+    {
+        CurrentTerm = new ecs_term_t { id = Ecs.Pair(first, second) };
+    }
+
+    private enum TermIdType
+    {
+        Src,
+        First,
+        Second
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="QueryBuilder"/> instances are equal.
+    /// </summary>
+    /// <param name="other"></param>
+    /// <returns></returns>
+    public bool Equals(QueryBuilder other)
+    {
+        return Desc == other.Desc;
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="QueryBuilder"/> instances are equal.
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is QueryBuilder other && Equals(other);
+    }
+
+    /// <summary>
+    ///     Returns the hash code for the <see cref="EventBuilder"/>.
+    /// </summary>
+    /// <returns></returns>
+    public override int GetHashCode()
+    {
+        return Desc.GetHashCode();
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="QueryBuilder"/> instances are equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator ==(QueryBuilder left, QueryBuilder right)
+    {
+        return left.Equals(right);
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="QueryBuilder"/> instances are not equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator !=(QueryBuilder left, QueryBuilder right)
+    {
+        return !(left == right);
+    }
+}
diff --git a/src/Flecs.NET/Core/Type.cs b/src/Flecs.NET/Core/Type.cs
index fb491f4c..09df067b 100644
--- a/src/Flecs.NET/Core/Type.cs
+++ b/src/Flecs.NET/Core/Type.cs
@@ -1,797 +1,799 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using Flecs.NET.Collections;
-using Flecs.NET.Core.BindingContext;
-using Flecs.NET.Core.Hooks;
-using Flecs.NET.Utilities;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-/// <summary>
-///     Static class that registers and stores information about types.
-/// </summary>
-/// <typeparam name="T"></typeparam>
-[SuppressMessage("ReSharper", "StaticMemberInGenericType")]
-public static unsafe class Type<T>
-{
-    /// <summary>
-    ///     The index that corresponds to its location in a world's type id cache.
-    /// </summary>
-    public static readonly int CacheIndex = Interlocked.Increment(ref Ecs.CacheIndexCount);
-
-    /// <summary>
-    ///     The full name of this type.
-    /// </summary>
-    public static readonly string FullName = GetFullName();
-
-    /// <summary>
-    ///     The name of this type.
-    /// </summary>
-    public static readonly string Name = GetName();
-
-    /// <summary>
-    ///     The size of the type.
-    /// </summary>
-    public static readonly int Size = SizeOf();
-
-    /// <summary>
-    ///     The alignment of the type.
-    /// </summary>
-    public static readonly int Alignment = AlignOf();
-
-    /// <summary>
-    ///     Whether the type is a tag.
-    /// </summary>
-    public static readonly bool IsTag = Size == 0 && Alignment == 0;
-
-    /// <summary>
-    ///     Whether the type is an enum.
-    /// </summary>
-    public static readonly bool IsEnum = typeof(T).IsEnum;
-
-    /// <summary>
-    ///     Whether the type is a native flecs type.
-    /// </summary>
-    public static readonly bool IsFlecsType = typeof(T).ToString().StartsWith(Ecs.NativeNamespace, StringComparison.Ordinal);
-
-    /// <summary>
-    ///     The underlying integer type if this type is an enum.
-    /// </summary>
-    public static readonly IntegerType UnderlyingType = GetUnderlyingType();
-
-    /// <summary>
-    ///     The underlying integer type id if this type is an enum.
-    /// </summary>
-    public static readonly ulong UnderlyingTypeId = GetUnderlyingTypeId();
-
-    /// <summary>
-    ///     The cache indexes of all enum members if this type is an enum.
-    /// </summary>
-    private static readonly NativeArray<EnumMember> Constants = InitEnumCacheIndexes();
-
-    /// <summary>
-    ///     Returns the id for this type with the provided world. Registers a new component id if it doesn't exist.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <returns>The id of the type in the world.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ulong Id(ecs_world_t* world)
-    {
-        ref ulong cachedId = ref LookupCacheIndex(world);
-        return Unsafe.IsNullRef(ref cachedId) || !ecs_is_alive(world, cachedId)
-            ? RegisterComponent(world, true, true, 0, "")
-            : cachedId;
-    }
-
-    /// <summary>
-    ///     Returns the id for this type with the provided world. Registers a new component id if it doesn't exist.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="ignoreScope">If true, the type will be registered in the root scope with it's full type name.</param>
-    /// <param name="isComponent">If true, type will be created with full component registration. (size, alignment, enums, hooks)</param>
-    /// <param name="id">If an existing entity is found with this id, attempt to alias it. Otherwise, register new entity with this id.</param>
-    /// <returns>The id of the type in the world.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ulong Id(ecs_world_t* world, bool ignoreScope, bool isComponent, ulong id)
-    {
-        ref ulong cachedId = ref LookupCacheIndex(world);
-        return Unsafe.IsNullRef(ref cachedId) || !ecs_is_alive(world, cachedId)
-            ? RegisterComponent(world, ignoreScope, isComponent, id, "")
-            : cachedId;
-    }
-
-    /// <summary>
-    ///     Returns the id for this type with the provided world. Registers a new component id if it doesn't exist.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="ignoreScope">If true, the type will be registered in the root scope with it's full type name.</param>
-    /// <param name="isComponent">If true, type will be created with full component registration. (size, alignment, enums, hooks)</param>
-    /// <param name="id">If an existing entity is found with this id, attempt to alias it. Otherwise, register new entity with this id.</param>
-    /// <param name="name">If an existing entity is found with this name, attempt to alias it. Otherwise, register new entity with this name.</param>
-    /// <returns>The id of the type in the world.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ulong Id(ecs_world_t* world, bool ignoreScope, bool isComponent, ulong id, string name)
-    {
-        ref ulong cachedId = ref LookupCacheIndex(world);
-        return Unsafe.IsNullRef(ref cachedId) || !ecs_is_alive(world, cachedId)
-            ? RegisterComponent(world, ignoreScope, isComponent, id, name)
-            : cachedId;
-    }
-
-    /// <summary>
-    ///     Returns the id for this enum member in the provided world. Registers a new id if it doesn't exist.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="constant">The enum member.</param>
-    /// <typeparam name="TEnum">The enum type.</typeparam>
-    /// <returns>The id of the enum member in the world.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ulong Id<TEnum>(ecs_world_t* world, TEnum constant) where TEnum : Enum, T
-    {
-        Id(world); // Ensures that component ids are registered for enum members.
-        return LookupCacheIndex(world, GetEnumCacheIndex(constant));
-    }
-
-    /// <summary>
-    ///     Ensures that the world has memory allocated at the provided cache index.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <returns>Reference to the id at the provided cache index.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ref ulong EnsureCacheIndex(ecs_world_t* world)
-    {
-        return ref EnsureCacheIndex(world, CacheIndex);
-    }
-
-    /// <summary>
-    ///     Ensures that the world has memory allocated at the provided cache index.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="index">The type cache index.</param>
-    /// <returns>Reference to the id at the provided cache index.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ref ulong EnsureCacheIndex(ecs_world_t* world, int index)
-    {
-        WorldContext* context = (WorldContext*)ecs_get_binding_ctx_fast(world);
-        Ecs.Assert(context != null, "World pointer must be created or passed into World.Create() to initialize binding context.");
-        ref NativeList<ulong> cache = ref context->TypeCache;
-        cache.EnsureCount(index + 1);
-        return ref cache.Data[index];
-    }
-
-    /// <summary>
-    ///     Gets a reference to the id occupying the provided cache index for this world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <returns>Reference to the id at the provided cache index. Returns a null reference if the index does not have a registered id yet.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ref ulong LookupCacheIndex(ecs_world_t* world)
-    {
-        return ref LookupCacheIndex(world, CacheIndex);
-    }
-
-    /// <summary>
-    ///     Gets a reference to the id occupying the provided cache index for this world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="index">The type cache index.</param>
-    /// <returns>Reference to the id at the provided cache index. Returns a null reference if the index does not have a registered id yet.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ref ulong LookupCacheIndex(ecs_world_t* world, int index)
-    {
-        WorldContext* context = (WorldContext*)ecs_get_binding_ctx_fast(world);
-        Ecs.Assert(context != null, "World pointer must be created or passed into World.Create() to initialize binding context.");
-        ref NativeList<ulong> cache = ref context->TypeCache;
-        return ref index >= cache.Count || cache.Data[index] == 0
-            ? ref Unsafe.NullRef<ulong>()
-            : ref cache.Data[index];
-    }
-
-    /// <summary>
-    ///     Checks if the type is registered in the provided world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <returns>True if the type is registered in the world.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsRegistered(ecs_world_t* world)
-    {
-        ref ulong cachedId = ref LookupCacheIndex(world);
-        return !Unsafe.IsNullRef(ref cachedId) && cachedId != 0 && ecs_is_alive(world, cachedId);
-    }
-
-    /// <summary>
-    ///     Checks if the type is registered in the provided world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="id">The id of the type if registered, else 0.</param>
-    /// <returns>True if the type was registered.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsRegistered(ecs_world_t* world, out ulong id)
-    {
-        ref ulong cachedId = ref LookupCacheIndex(world);
-
-        id = !Unsafe.IsNullRef(ref cachedId) && cachedId != 0 && ecs_is_alive(world, cachedId)
-            ? cachedId
-            : 0;
-
-        return id != 0;
-    }
-
-    /// <summary>
-    ///     Checks if the type is registered in the provided world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    /// <param name="id">The id of the type if registered, else 0.</param>
-    /// <returns>True if the type was registered.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsRegistered(ecs_world_t* world, out Entity id)
-    {
-        ref ulong cachedId = ref LookupCacheIndex(world);
-
-        id = !Unsafe.IsNullRef(ref cachedId) && cachedId != 0 && ecs_is_alive(world, cachedId)
-            ? new Entity(world, cachedId)
-            : default;
-
-        return id != 0;
-    }
-
-    /// <summary>
-    ///     Registers this type with the provided world.
-    /// </summary>
-    /// <param name="world">The ECS world.</param>
-    /// <param name="ignoreScope">If true, the type will be registered in the root scope with it's full type name.</param>
-    /// <param name="isComponent">If true, type will be created with full component registration. (size, alignment, enums, hooks)</param>
-    /// <param name="id">If an existing entity is found with this id, attempt to alias it. Otherwise, register new entity with this id.</param>
-    /// <param name="name">If an existing entity is found with this name, attempt to alias it. Otherwise, register new entity with this name.</param>
-    /// <returns>The registered id of this type.</returns>
-    public static ulong RegisterComponent(World world, bool ignoreScope, bool isComponent, ulong id, string name)
-    {
-        Ecs.Assert(!world.GetWorld().IsReadOnly() || world.GetWorld().GetStageCount() <= 1,
-            "Cannot register component while multithreaded world is progressing/readonly.");
-
-        // If a name or id is provided, the type is being used to alias an already existing entity.
-        Entity existingEntity = id != 0 ? new Entity(world, id) : world.Lookup(name, false);
-
-        // If an existing entity is found, ensure that the size and alignment match the entity and return its id.
-        if (isComponent && existingEntity != 0 || world.TryLookupSymbol(FullName, out existingEntity))
-        {
-            if (IsFlecsType)
-                return EnsureCacheIndex(world) = existingEntity;
-
-            ref EcsComponent info = ref existingEntity.GetMut<EcsComponent>();
-
-            if (Unsafe.IsNullRef(ref info))
-                Ecs.Assert(IsTag, $"Cannot alias '{existingEntity.Path()}' with a '{FullName}'. '{FullName}' must be a zero-sized struct");
-            else
-                Ecs.Assert(info.size == Size && info.alignment == Alignment, $"Layout of type '{FullName}' (Size: {Size}, Alignment: {Alignment}) does not match currently registered layout (Size: {info.size}, Alignment: {info.alignment})");
-
-            return EnsureCacheIndex(world) = existingEntity;
-        }
-
-        Entity prevScope = world.SetScope(ignoreScope ? 0ul : world.GetScope());
-        Entity prevWith = world.SetWith(ignoreScope ? 0ul : world.GetWith());
-
-        using NativeString nativeSymbol = (NativeString)FullName;
-        using NativeString nativeName = string.IsNullOrEmpty(name)
-            ? (NativeString)GetTrimmedTypeName(world)
-            : (NativeString)name;
-
-        ecs_entity_desc_t entityDesc = default;
-        entityDesc.id = id;
-        entityDesc.use_low_id = true;
-        entityDesc.name = nativeName;
-        entityDesc.symbol = nativeSymbol;
-        entityDesc.sep = Pointers.DefaultSeparator;
-        entityDesc.root_sep = Pointers.DefaultSeparator;
-        ulong entity = ecs_entity_init(world, &entityDesc);
-        Ecs.Assert(entity != 0, $"Failed to register entity for type '{FullName}'");
-
-        EnsureCacheIndex(world) = entity;
-
-        if (!isComponent)
-            return entity;
-
-        ecs_component_desc_t componentDesc = default;
-        componentDesc.entity = entity;
-        componentDesc.type.size = Size;
-        componentDesc.type.alignment = Alignment;
-        ulong component = ecs_component_init(world, &componentDesc);
-        Ecs.Assert(component != 0, $"Failed to register component for type '{FullName}'");
-
-        world.SetWith(prevWith);
-        world.SetScope(prevScope);
-
-        // Store the type in the component.
-        if (typeof(T) != typeof(Type))
-            RegisterDotnetType(world, world.Entity(component));
-
-        if (typeof(T).IsEnum)
-            RegisterConstants(world, world.Entity(component));
-
-        if (IsTag)
-            return component;
-
-        // Register type hooks.
-        TypeHooksContext hooksContext = TypeHooksContext.Default;
-
-        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-        {
-            hooksContext.Ctor.Invoker = (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedCtorCallback<T>;
-            hooksContext.Dtor.Invoker = (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedDtorCallback<T>;
-            hooksContext.Copy.Invoker = (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedCopyCallback<T>;
-            hooksContext.Move.Invoker = (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedMoveCallback<T>;
-        }
-
-        if (typeof(ICtorHook<T>).IsAssignableFrom(typeof(T)))
-        {
-            hooksContext.Ctor.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
-                ? (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedCtorCallbackPointer<T>
-                : (delegate*<T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedCtorCallbackPointer<T>;
-
-            hooksContext.Ctor.Pointer = (void*)(nint)typeof(ICtorHook<>.FunctionPointer<>)
-                .MakeGenericType(typeof(T), typeof(T))
-                .GetMethod("Get")!
-                .Invoke(null, null)!;
-        }
-
-        if (typeof(IDtorHook<T>).IsAssignableFrom(typeof(T)))
-        {
-            hooksContext.Dtor.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
-                ? (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedDtorCallbackPointer<T>
-                : (delegate*<T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedDtorCallbackPointer<T>;
-
-            hooksContext.Dtor.Pointer = (void*)(nint)typeof(IDtorHook<>.FunctionPointer<>)
-                .MakeGenericType(typeof(T), typeof(T))
-                .GetMethod("Get")!
-                .Invoke(null, null)!;
-        }
-
-        if (typeof(ICopyHook<T>).IsAssignableFrom(typeof(T)))
-        {
-            hooksContext.Copy.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
-                ? (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedCopyCallbackPointer<T>
-                : (delegate*<T*, T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedCopyCallbackPointer<T>;
-
-            hooksContext.Copy.Pointer = (void*)(nint)typeof(ICopyHook<>.FunctionPointer<>)
-                .MakeGenericType(typeof(T), typeof(T))
-                .GetMethod("Get")!
-                .Invoke(null, null)!;
-        }
-
-        if (typeof(IMoveHook<T>).IsAssignableFrom(typeof(T)))
-        {
-            hooksContext.Move.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
-                ? (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedMoveCallbackPointer<T>
-                : (delegate*<T*, T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedMoveCallbackPointer<T>;
-
-            hooksContext.Move.Pointer = (void*)(nint)typeof(IMoveHook<>.FunctionPointer<>)
-                .MakeGenericType(typeof(T), typeof(T))
-                .GetMethod("Get")!
-                .Invoke(null, null)!;
-        }
-
-        if (typeof(IOnAddHook<T>).IsAssignableFrom(typeof(T)))
-        {
-            hooksContext.OnAdd.Invoker = (delegate*<ecs_iter_t*, void>)&Functions.OnAddEachIterRefCallbackPointer<T>;
-            hooksContext.OnAdd.Pointer = (void*)(nint)typeof(IOnAddHook<>.FunctionPointer<>)
-                .MakeGenericType(typeof(T), typeof(T))
-                .GetMethod("Get")!
-                .Invoke(null, null)!;
-        }
-
-        if (typeof(IOnRemoveHook<T>).IsAssignableFrom(typeof(T)))
-        {
-            hooksContext.OnRemove.Invoker = (delegate*<ecs_iter_t*, void>)&Functions.OnRemoveEachIterRefCallbackPointer<T>;
-            hooksContext.OnRemove.Pointer = (void*)(nint)typeof(IOnRemoveHook<>.FunctionPointer<>)
-                .MakeGenericType(typeof(T), typeof(T))
-                .GetMethod("Get")!
-                .Invoke(null, null)!;
-        }
-
-        if (typeof(IOnSetHook<T>).IsAssignableFrom(typeof(T)))
-        {
-            hooksContext.OnSet.Invoker = (delegate*<ecs_iter_t*, void>)&Functions.OnSetEachIterRefCallbackPointer<T>;
-            hooksContext.OnSet.Pointer = (void*)(nint)typeof(IOnSetHook<>.FunctionPointer<>)
-                .MakeGenericType(typeof(T), typeof(T))
-                .GetMethod("Get")!
-                .Invoke(null, null)!;
-        }
-
-        ecs_type_hooks_t hooks = default;
-        hooks.ctor = hooksContext.Ctor == default ? default : &Functions.CtorCallback;
-        hooks.dtor = hooksContext.Dtor == default ? default : &Functions.DtorCallback;
-        hooks.copy = hooksContext.Copy == default ? default : &Functions.CopyCallback;
-        hooks.move = hooksContext.Move == default ? default : &Functions.MoveCallback;
-        hooks.on_add = hooksContext.OnAdd == default ? default : &Functions.OnAddCallback;
-        hooks.on_remove = hooksContext.OnRemove == default ? default : &Functions.OnRemoveCallback;
-        hooks.on_set = hooksContext.OnSet == default ? default : &Functions.OnSetCallback;
-        hooks.binding_ctx = Memory.Alloc(hooksContext);
-        hooks.binding_ctx_free = &Functions.TypeHooksContextFree;
-
-        ecs_set_hooks_id(world, component, &hooks);
-
-        return component;
-    }
-
-    /// <summary>
-    ///     Returns a trimmed version of this type's full name with respect to the current scope of the world.
-    /// </summary>
-    /// <param name="world">The world.</param>
-    public static string GetTrimmedTypeName(World world)
-    {
-        Entity scope = world.GetScope();
-
-        if (scope == 0)
-            return FullName;
-
-        string scopePath = scope.Path(initSep: "");
-
-        // If the the start of the type's full name matches the current scope's path, trim the scope's path
-        // from the full type name and return. Otherwise return only the name of the type.
-        return FullName.StartsWith(scopePath, StringComparison.Ordinal)
-            ? FullName[(scopePath.Length + 1)..]
-            : Name;
-    }
-
-    private static NativeArray<EnumMember> InitEnumCacheIndexes()
-    {
-        if (!IsEnum)
-            return default;
-
-        Array values = typeof(T).GetEnumValuesAsUnderlyingType();
-        NativeArray<EnumMember> constants = new NativeArray<EnumMember>(values.Length);
-
-        for (int i = 0; i < values.Length; i++)
-        {
-            long value = UnderlyingType switch
-            {
-                IntegerType.SByte => (sbyte)values.GetValue(i)!,
-                IntegerType.Byte => (byte)values.GetValue(i)!,
-                IntegerType.Int16 => (short)values.GetValue(i)!,
-                IntegerType.UInt16 => (ushort)values.GetValue(i)!,
-                IntegerType.Int32 => (int)values.GetValue(i)!,
-                IntegerType.UInt32 => (uint)values.GetValue(i)!,
-                IntegerType.Int64 => (long)values.GetValue(i)!,
-                IntegerType.UInt64 => (long)(ulong)values.GetValue(i)!,
-                _ => throw new Ecs.ErrorException("Type is not an enum.")
-            };
-            constants[i] = new EnumMember(value, Interlocked.Increment(ref Ecs.CacheIndexCount));
-        }
-
-        return constants;
-    }
-
-    private static void RegisterDotnetType(World world, Entity type)
-    {
-        ecs_suspend_readonly_state_t state = default;
-        world = flecs_suspend_readonly(world, &state);
-        type.Set(typeof(T));
-        flecs_resume_readonly(world, &state);
-    }
-
-    private static void RegisterConstants(World world, Entity type)
-    {
-        ecs_suspend_readonly_state_t state = default;
-        world = flecs_suspend_readonly(world, &state);
-
-        type.Set(new EcsEnum { underlying_type = UnderlyingTypeId });
-
-        Entity prevScope = world.SetScope(type);
-
-        for (int i = 0; i < Constants.Length; i++)
-        {
-            long value = Constants[i].Value;
-            string name = Unsafe.As<long, T>(ref value)!.ToString()!;
-            EnsureCacheIndex(world, Constants[i].CacheIndex) =
-                world.Entity(name).SetUntyped(EcsConstant, UnderlyingTypeId, sizeof(T), &value);
-        }
-
-        world.SetScope(prevScope);
-
-        flecs_resume_readonly(world, &state);
-    }
-
-    // Binary search enum list for enum constant's cache index.
-    private static int GetEnumCacheIndex<TEnum>(TEnum constant) where TEnum : Enum, T
-    {
-        long value = GetEnumConstantAsLong(constant);
-
-        int left = 0;
-        int right = Constants.Length - 1;
-
-        while (left <= right)
-        {
-            int mid = left + (right - left) / 2;
-
-            ref EnumMember data = ref Constants.Data[mid];
-
-            if (data.Value == value)
-                return data.CacheIndex;
-
-            if (data.Value < value)
-                left = ++mid;
-            else
-                right = --mid;
-        }
-
-        Ecs.Assert(false, $"No id registered for '{constant}'");
-        return 0;
-    }
-
-    private static long GetEnumConstantAsLong<TEnum>(TEnum constant) where TEnum : Enum, T
-    {
-        return UnderlyingType switch
-        {
-            IntegerType.SByte => Unsafe.As<TEnum, sbyte>(ref constant),
-            IntegerType.Byte => Unsafe.As<TEnum, byte>(ref constant),
-            IntegerType.Int16 => Unsafe.As<TEnum, short>(ref constant),
-            IntegerType.UInt16 => Unsafe.As<TEnum, ushort>(ref constant),
-            IntegerType.Int32 => Unsafe.As<TEnum, int>(ref constant),
-            IntegerType.UInt32 => Unsafe.As<TEnum, uint>(ref constant),
-            IntegerType.Int64 => Unsafe.As<TEnum, long>(ref constant),
-            IntegerType.UInt64 => (long)Unsafe.As<TEnum, ulong>(ref constant),
-            _ => throw new Ecs.ErrorException("Type is not an enum.")
-        };
-    }
-
-    private static IntegerType GetUnderlyingType()
-    {
-        if (!IsEnum)
-            return IntegerType.None;
-
-        Type underlyingType = typeof(T).GetEnumUnderlyingType();
-
-        if (underlyingType == typeof(sbyte))
-            return IntegerType.SByte;
-
-        if (underlyingType == typeof(byte))
-            return IntegerType.Byte;
-
-        if (underlyingType == typeof(short))
-            return IntegerType.Int16;
-
-        if (underlyingType == typeof(ushort))
-            return IntegerType.UInt16;
-
-        if (underlyingType == typeof(int))
-            return IntegerType.Int32;
-
-        if (underlyingType == typeof(uint))
-            return IntegerType.UInt32;
-
-        if (underlyingType == typeof(long))
-            return IntegerType.Int64;
-
-        if (underlyingType == typeof(ulong))
-            return IntegerType.UInt64;
-
-        return IntegerType.None;
-    }
-
-    private static ulong GetUnderlyingTypeId()
-    {
-        return UnderlyingType switch
-        {
-            IntegerType.SByte => FLECS_IDecs_i8_tID_,
-            IntegerType.Byte => FLECS_IDecs_u8_tID_,
-            IntegerType.Int16 => FLECS_IDecs_i16_tID_,
-            IntegerType.UInt16 => FLECS_IDecs_u16_tID_,
-            IntegerType.Int32 => FLECS_IDecs_i32_tID_,
-            IntegerType.UInt32 => FLECS_IDecs_u32_tID_,
-            IntegerType.Int64 => FLECS_IDecs_i64_tID_,
-            IntegerType.UInt64 => FLECS_IDecs_u64_tID_,
-            _ => 0
-        };
-    }
-
-    private static string GetName()
-    {
-        string fullname = GetFullName();
-
-        int trimEnd;
-
-        if (fullname.Contains('<', StringComparison.Ordinal))
-            trimEnd = fullname.LastIndexOf('.', fullname.IndexOf('<', StringComparison.Ordinal)) + 1;
-        else
-            trimEnd = fullname.LastIndexOf('.') + 1;
-
-        return fullname[trimEnd..];
-    }
-
-    private static string GetFullName()
-    {
-        string name = typeof(T).ToString();
-
-        // File-local types are prefixed with a file name + GUID.
-        if (Ecs.StripFileLocalTypeNameGuid)
-        {
-            int start = 0;
-            bool skip = false;
-
-            StringBuilder stringBuilder = new StringBuilder();
-
-            for (int current = 0; current < name.Length;)
-            {
-                char c = name[current];
-
-                if (skip && c == '_')
-                {
-                    skip = false;
-                    start = current + 2;
-                }
-                else if (!skip && c == '<')
-                {
-                    skip = true;
-                    stringBuilder.Append(name.AsSpan(start, current - start));
-                    current = name.IndexOf('>', current) + 1;
-                    continue;
-                }
-
-                current++;
-            }
-
-            stringBuilder.Append(name.AsSpan(start));
-            name = stringBuilder.ToString();
-        }
-
-        {
-            name = name
-                .Replace(Ecs.NativeNamespace, string.Empty, StringComparison.Ordinal)
-                .Replace('+', '.')
-                .Replace('[', '<')
-                .Replace(']', '>');
-
-            int start = 0;
-            int current = 0;
-            bool skip = false;
-
-            StringBuilder stringBuilder = new StringBuilder();
-
-            foreach (char c in name)
-            {
-                if (skip && (c == '<' || c == '.'))
-                {
-                    start = current;
-                    skip = false;
-                }
-                else if (!skip && c == '`')
-                {
-                    stringBuilder.Append(name.AsSpan(start, current - start));
-                    skip = true;
-                }
-
-                current++;
-            }
-
-            return stringBuilder.Append(name.AsSpan(start)).ToString();
-        }
-    }
-
-    private static int SizeOf()
-    {
-        NativeLayout(out int size, out int _);
-        return size;
-    }
-
-    private static int AlignOf()
-    {
-        NativeLayout(out int _, out int alignment);
-        return alignment;
-    }
-
-    [SuppressMessage("Usage", "CA1508")]
-    private static void NativeLayout(out int size, out int alignment)
-    {
-        Type type = typeof(T);
-        StructLayoutAttribute attribute = type.StructLayoutAttribute!;
-
-        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-        {
-            size = sizeof(GCHandle);
-            alignment = sizeof(GCHandle);
-            return;
-        }
-
-        if (attribute.Value == LayoutKind.Explicit)
-        {
-            size = attribute.Size == 0 ? sizeof(T) : attribute.Size;
-            alignment = attribute.Pack == 0 ? sizeof(AlignOfHelper) - sizeof(T) : attribute.Pack;
-        }
-        else
-        {
-            size = sizeof(T);
-            alignment = sizeof(AlignOfHelper) - sizeof(T);
-        }
-
-        if (RuntimeFeature.IsDynamicCodeSupported)
-        {
-            FieldInfo[] fields =
-                type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-            size = fields.Length == 0 ? 0 : size;
-            alignment = size == 0 ? 0 : alignment;
-        }
-        else if (sizeof(T) == 1)
-        {
-            // Structs containing zero non-static fields will always return true when compared using .Equals().
-            // Test for tags by changing the underlying byte and checking equality.
-            // If the structs always return true, it's likely that the struct is a tag.
-
-            T aInstance = default!;
-            T bInstance = default!;
-
-            for (byte i = 0; i < 16; i++)
-            {
-                *(byte*)&bInstance = i;
-                if (!Equals(aInstance, bInstance))
-                    return;
-            }
-
-            size = 0;
-            alignment = 0;
-        }
-    }
-
-    [SuppressMessage("ReSharper", "PrivateFieldCanBeConvertedToLocalVariable")]
-    [SuppressMessage("ReSharper", "NotAccessedPositionalProperty.Local")]
-    private readonly record struct AlignOfHelper(byte Dummy, T Data);
-
-    [SuppressMessage("ReSharper", "MemberHidesStaticFromOuterClass")]
-    private readonly record struct EnumMember(long Value, int CacheIndex);
-
-    /// <summary>
-    ///     Represents the underlying integer type of an enum.
-    /// </summary>
-    public enum IntegerType
-    {
-        /// <summary>
-        ///     This type is not an enum.
-        /// </summary>
-        None,
-
-        /// <summary>
-        ///     <see cref="sbyte"/>
-        /// </summary>
-        SByte,
-
-        /// <summary>
-        ///     <see cref="byte"/>
-        /// </summary>
-        Byte,
-
-        /// <summary>
-        ///     <see cref="short"/>
-        /// </summary>
-        Int16,
-
-        /// <summary>
-        ///     <see cref="ushort"/>
-        /// </summary>
-        UInt16,
-
-        /// <summary>
-        ///     <see cref="int"/>
-        /// </summary>
-        Int32,
-
-        /// <summary>
-        ///     <see cref="uint"/>
-        /// </summary>
-        UInt32,
-
-        /// <summary>
-        ///     <see cref="long"/>
-        /// </summary>
-        Int64,
-
-        /// <summary>
-        ///     <see cref="ulong"/>
-        /// </summary>
-        UInt64
-    }
-}
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using Flecs.NET.Collections;
+using Flecs.NET.Core.BindingContext;
+using Flecs.NET.Core.Hooks;
+using Flecs.NET.Utilities;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+/// <summary>
+///     Static class that registers and stores information about types.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+[SuppressMessage("ReSharper", "StaticMemberInGenericType")]
+public static unsafe class Type<T>
+{
+    /// <summary>
+    ///     The index that corresponds to its location in a world's type id cache.
+    /// </summary>
+    public static readonly int CacheIndex = Interlocked.Increment(ref Ecs.CacheIndexCount);
+
+    /// <summary>
+    ///     The full name of this type.
+    /// </summary>
+    public static readonly string FullName = GetFullName();
+
+    /// <summary>
+    ///     The name of this type.
+    /// </summary>
+    public static readonly string Name = GetName();
+
+    /// <summary>
+    ///     The size of the type.
+    /// </summary>
+    public static readonly int Size = SizeOf();
+
+    /// <summary>
+    ///     The alignment of the type.
+    /// </summary>
+    public static readonly int Alignment = AlignOf();
+
+    /// <summary>
+    ///     Whether the type is a tag.
+    /// </summary>
+    public static readonly bool IsTag = Size == 0 && Alignment == 0;
+
+    /// <summary>
+    ///     Whether the type is an enum.
+    /// </summary>
+    public static readonly bool IsEnum = typeof(T).IsEnum;
+
+    /// <summary>
+    ///     Whether the type is a native flecs type.
+    /// </summary>
+    public static readonly bool IsFlecsType = typeof(T).ToString().StartsWith(Ecs.NativeNamespace, StringComparison.Ordinal);
+
+    /// <summary>
+    ///     The underlying integer type if this type is an enum.
+    /// </summary>
+    public static readonly IntegerType UnderlyingType = GetUnderlyingType();
+
+    /// <summary>
+    ///     The underlying integer type id if this type is an enum.
+    /// </summary>
+    public static readonly ulong UnderlyingTypeId = GetUnderlyingTypeId();
+
+    /// <summary>
+    ///     The cache indexes of all enum members if this type is an enum.
+    /// </summary>
+    private static readonly NativeArray<EnumMember> Constants = InitEnumCacheIndexes();
+
+    /// <summary>
+    ///     Returns the id for this type with the provided world. Registers a new component id if it doesn't exist.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <returns>The id of the type in the world.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ulong Id(ecs_world_t* world)
+    {
+        ref ulong cachedId = ref LookupCacheIndex(world);
+        return Unsafe.IsNullRef(ref cachedId) || !ecs_is_alive(world, cachedId)
+            ? RegisterComponent(world, true, true, 0, "")
+            : cachedId;
+    }
+
+    /// <summary>
+    ///     Returns the id for this type with the provided world. Registers a new component id if it doesn't exist.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="ignoreScope">If true, the type will be registered in the root scope with it's full type name.</param>
+    /// <param name="isComponent">If true, type will be created with full component registration. (size, alignment, enums, hooks)</param>
+    /// <param name="id">If an existing entity is found with this id, attempt to alias it. Otherwise, register new entity with this id.</param>
+    /// <returns>The id of the type in the world.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ulong Id(ecs_world_t* world, bool ignoreScope, bool isComponent, ulong id)
+    {
+        ref ulong cachedId = ref LookupCacheIndex(world);
+        return Unsafe.IsNullRef(ref cachedId) || !ecs_is_alive(world, cachedId)
+            ? RegisterComponent(world, ignoreScope, isComponent, id, "")
+            : cachedId;
+    }
+
+    /// <summary>
+    ///     Returns the id for this type with the provided world. Registers a new component id if it doesn't exist.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="ignoreScope">If true, the type will be registered in the root scope with it's full type name.</param>
+    /// <param name="isComponent">If true, type will be created with full component registration. (size, alignment, enums, hooks)</param>
+    /// <param name="id">If an existing entity is found with this id, attempt to alias it. Otherwise, register new entity with this id.</param>
+    /// <param name="name">If an existing entity is found with this name, attempt to alias it. Otherwise, register new entity with this name.</param>
+    /// <returns>The id of the type in the world.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ulong Id(ecs_world_t* world, bool ignoreScope, bool isComponent, ulong id, string name)
+    {
+        ref ulong cachedId = ref LookupCacheIndex(world);
+        return Unsafe.IsNullRef(ref cachedId) || !ecs_is_alive(world, cachedId)
+            ? RegisterComponent(world, ignoreScope, isComponent, id, name)
+            : cachedId;
+    }
+
+    /// <summary>
+    ///     Returns the id for this enum member in the provided world. Registers a new id if it doesn't exist.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="constant">The enum member.</param>
+    /// <typeparam name="TEnum">The enum type.</typeparam>
+    /// <returns>The id of the enum member in the world.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ulong Id<TEnum>(ecs_world_t* world, TEnum constant) where TEnum : Enum, T
+    {
+        Id(world); // Ensures that component ids are registered for enum members.
+        return LookupCacheIndex(world, GetEnumCacheIndex(constant));
+    }
+
+    /// <summary>
+    ///     Ensures that the world has memory allocated at the provided cache index.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <returns>Reference to the id at the provided cache index.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ref ulong EnsureCacheIndex(ecs_world_t* world)
+    {
+        return ref EnsureCacheIndex(world, CacheIndex);
+    }
+
+    /// <summary>
+    ///     Ensures that the world has memory allocated at the provided cache index.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="index">The type cache index.</param>
+    /// <returns>Reference to the id at the provided cache index.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ref ulong EnsureCacheIndex(ecs_world_t* world, int index)
+    {
+        WorldContext* context = (WorldContext*)ecs_get_binding_ctx_fast(world);
+        Ecs.Assert(context != null, "World pointer must be created or passed into World.Create() to initialize binding context.");
+        ref NativeList<ulong> cache = ref context->TypeCache;
+        cache.EnsureCount(index + 1);
+        return ref cache.Data[index];
+    }
+
+    /// <summary>
+    ///     Gets a reference to the id occupying the provided cache index for this world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <returns>Reference to the id at the provided cache index. Returns a null reference if the index does not have a registered id yet.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ref ulong LookupCacheIndex(ecs_world_t* world)
+    {
+        return ref LookupCacheIndex(world, CacheIndex);
+    }
+
+    /// <summary>
+    ///     Gets a reference to the id occupying the provided cache index for this world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="index">The type cache index.</param>
+    /// <returns>Reference to the id at the provided cache index. Returns a null reference if the index does not have a registered id yet.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ref ulong LookupCacheIndex(ecs_world_t* world, int index)
+    {
+        WorldContext* context = (WorldContext*)ecs_get_binding_ctx_fast(world);
+        Ecs.Assert(context != null, "World pointer must be created or passed into World.Create() to initialize binding context.");
+        ref NativeList<ulong> cache = ref context->TypeCache;
+        return ref index >= cache.Count || cache.Data[index] == 0
+            ? ref Unsafe.NullRef<ulong>()
+            : ref cache.Data[index];
+    }
+
+    /// <summary>
+    ///     Checks if the type is registered in the provided world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <returns>True if the type is registered in the world.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool IsRegistered(ecs_world_t* world)
+    {
+        ref ulong cachedId = ref LookupCacheIndex(world);
+        return !Unsafe.IsNullRef(ref cachedId) && cachedId != 0 && ecs_is_alive(world, cachedId);
+    }
+
+    /// <summary>
+    ///     Checks if the type is registered in the provided world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="id">The id of the type if registered, else 0.</param>
+    /// <returns>True if the type was registered.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool IsRegistered(ecs_world_t* world, out ulong id)
+    {
+        ref ulong cachedId = ref LookupCacheIndex(world);
+
+        id = !Unsafe.IsNullRef(ref cachedId) && cachedId != 0 && ecs_is_alive(world, cachedId)
+            ? cachedId
+            : 0;
+
+        return id != 0;
+    }
+
+    /// <summary>
+    ///     Checks if the type is registered in the provided world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    /// <param name="id">The id of the type if registered, else 0.</param>
+    /// <returns>True if the type was registered.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool IsRegistered(ecs_world_t* world, out Entity id)
+    {
+        ref ulong cachedId = ref LookupCacheIndex(world);
+
+        id = !Unsafe.IsNullRef(ref cachedId) && cachedId != 0 && ecs_is_alive(world, cachedId)
+            ? new Entity(world, cachedId)
+            : default;
+
+        return id != 0;
+    }
+
+    /// <summary>
+    ///     Registers this type with the provided world.
+    /// </summary>
+    /// <param name="world">The ECS world.</param>
+    /// <param name="ignoreScope">If true, the type will be registered in the root scope with it's full type name.</param>
+    /// <param name="isComponent">If true, type will be created with full component registration. (size, alignment, enums, hooks)</param>
+    /// <param name="id">If an existing entity is found with this id, attempt to alias it. Otherwise, register new entity with this id.</param>
+    /// <param name="name">If an existing entity is found with this name, attempt to alias it. Otherwise, register new entity with this name.</param>
+    /// <returns>The registered id of this type.</returns>
+    public static ulong RegisterComponent(World world, bool ignoreScope, bool isComponent, ulong id, string name)
+    {
+        Ecs.Assert(!world.GetWorld().IsReadOnly() || world.GetWorld().GetStageCount() <= 1,
+            "Cannot register component while multithreaded world is progressing/readonly.");
+
+        // If a name or id is provided, the type is being used to alias an already existing entity.
+        Entity existingEntity = id != 0 ? new Entity(world, id) : world.Lookup(name, false);
+
+        // If an existing entity is found, ensure that the size and alignment match the entity and return its id.
+        if (isComponent && existingEntity != 0 || world.TryLookupSymbol(FullName, out existingEntity))
+        {
+            if (IsFlecsType)
+                return EnsureCacheIndex(world) = existingEntity;
+
+            ref EcsComponent info = ref existingEntity.GetMut<EcsComponent>();
+
+            if (Unsafe.IsNullRef(ref info))
+                Ecs.Assert(IsTag, $"Cannot alias '{existingEntity.Path()}' with a '{FullName}'. '{FullName}' must be a zero-sized struct");
+            else
+                Ecs.Assert(info.size == Size && info.alignment == Alignment, $"Layout of type '{FullName}' (Size: {Size}, Alignment: {Alignment}) does not match currently registered layout (Size: {info.size}, Alignment: {info.alignment})");
+
+            return EnsureCacheIndex(world) = existingEntity;
+        }
+
+        Entity prevScope = world.SetScope(ignoreScope ? 0ul : world.GetScope());
+        Entity prevWith = world.SetWith(ignoreScope ? 0ul : world.GetWith());
+
+        using NativeString nativeSymbol = (NativeString)FullName;
+        using NativeString nativeName = string.IsNullOrEmpty(name)
+            ? (NativeString)GetTrimmedTypeName(world)
+            : (NativeString)name;
+
+        ecs_entity_desc_t entityDesc = default;
+        entityDesc.id = id;
+        entityDesc.use_low_id = true;
+        entityDesc.name = nativeName;
+        entityDesc.symbol = nativeSymbol;
+        entityDesc.sep = Pointers.DefaultSeparator;
+        entityDesc.root_sep = Pointers.DefaultSeparator;
+        ulong entity = ecs_entity_init(world, &entityDesc);
+        Ecs.Assert(entity != 0, $"Failed to register entity for type '{FullName}'");
+
+        EnsureCacheIndex(world) = entity;
+
+        if (!isComponent)
+            return entity;
+
+        ecs_component_desc_t componentDesc = default;
+        componentDesc.entity = entity;
+        componentDesc.type.size = Size;
+        componentDesc.type.alignment = Alignment;
+        ulong component = ecs_component_init(world, &componentDesc);
+        Ecs.Assert(component != 0, $"Failed to register component for type '{FullName}'");
+        Ecs.Assert(component == entity, $"Registered component ID wasn't the same as its entity for type '{FullName}'");
+
+        world.SetWith(prevWith);
+        world.SetScope(prevScope);
+
+        // Store the type in the component.
+        if (typeof(T) != typeof(Type))
+            RegisterDotnetType(world, world.Entity(component));
+
+        if (typeof(T).IsEnum)
+            RegisterConstants(world, world.Entity(component));
+
+        if (IsTag)
+            return component;
+
+        // Register type hooks.
+        TypeHooksContext hooksContext = TypeHooksContext.Default;
+
+        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+        {
+            hooksContext.Ctor.Invoker = (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedCtorCallback<T>;
+            hooksContext.Dtor.Invoker = (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedDtorCallback<T>;
+            hooksContext.Copy.Invoker = (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedCopyCallback<T>;
+            hooksContext.Move.Invoker = (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.DefaultManagedMoveCallback<T>;
+        }
+
+        if (typeof(ICtorHook<T>).IsAssignableFrom(typeof(T)))
+        {
+            hooksContext.Ctor.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
+                ? (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedCtorCallbackPointer<T>
+                : (delegate*<T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedCtorCallbackPointer<T>;
+
+            hooksContext.Ctor.Pointer = (void*)(nint)typeof(ICtorHook<>.FunctionPointer<>)
+                .MakeGenericType(typeof(T), typeof(T))
+                .GetMethod("Get")!
+                .Invoke(null, null)!;
+        }
+
+        if (typeof(IDtorHook<T>).IsAssignableFrom(typeof(T)))
+        {
+            hooksContext.Dtor.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
+                ? (delegate*<GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedDtorCallbackPointer<T>
+                : (delegate*<T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedDtorCallbackPointer<T>;
+
+            hooksContext.Dtor.Pointer = (void*)(nint)typeof(IDtorHook<>.FunctionPointer<>)
+                .MakeGenericType(typeof(T), typeof(T))
+                .GetMethod("Get")!
+                .Invoke(null, null)!;
+        }
+
+        if (typeof(ICopyHook<T>).IsAssignableFrom(typeof(T)))
+        {
+            hooksContext.Copy.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
+                ? (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedCopyCallbackPointer<T>
+                : (delegate*<T*, T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedCopyCallbackPointer<T>;
+
+            hooksContext.Copy.Pointer = (void*)(nint)typeof(ICopyHook<>.FunctionPointer<>)
+                .MakeGenericType(typeof(T), typeof(T))
+                .GetMethod("Get")!
+                .Invoke(null, null)!;
+        }
+
+        if (typeof(IMoveHook<T>).IsAssignableFrom(typeof(T)))
+        {
+            hooksContext.Move.Invoker = RuntimeHelpers.IsReferenceOrContainsReferences<T>()
+                ? (delegate*<GCHandle*, GCHandle*, int, ecs_type_info_t*, void>)&Functions.ManagedMoveCallbackPointer<T>
+                : (delegate*<T*, T*, int, ecs_type_info_t*, void>)&Functions.UnmanagedMoveCallbackPointer<T>;
+
+            hooksContext.Move.Pointer = (void*)(nint)typeof(IMoveHook<>.FunctionPointer<>)
+                .MakeGenericType(typeof(T), typeof(T))
+                .GetMethod("Get")!
+                .Invoke(null, null)!;
+        }
+
+        if (typeof(IOnAddHook<T>).IsAssignableFrom(typeof(T)))
+        {
+            hooksContext.OnAdd.Invoker = (delegate*<ecs_iter_t*, void>)&Functions.OnAddEachIterRefCallbackPointer<T>;
+            hooksContext.OnAdd.Pointer = (void*)(nint)typeof(IOnAddHook<>.FunctionPointer<>)
+                .MakeGenericType(typeof(T), typeof(T))
+                .GetMethod("Get")!
+                .Invoke(null, null)!;
+        }
+
+        if (typeof(IOnRemoveHook<T>).IsAssignableFrom(typeof(T)))
+        {
+            hooksContext.OnRemove.Invoker = (delegate*<ecs_iter_t*, void>)&Functions.OnRemoveEachIterRefCallbackPointer<T>;
+            hooksContext.OnRemove.Pointer = (void*)(nint)typeof(IOnRemoveHook<>.FunctionPointer<>)
+                .MakeGenericType(typeof(T), typeof(T))
+                .GetMethod("Get")!
+                .Invoke(null, null)!;
+        }
+
+        if (typeof(IOnSetHook<T>).IsAssignableFrom(typeof(T)))
+        {
+            hooksContext.OnSet.Invoker = (delegate*<ecs_iter_t*, void>)&Functions.OnSetEachIterRefCallbackPointer<T>;
+            hooksContext.OnSet.Pointer = (void*)(nint)typeof(IOnSetHook<>.FunctionPointer<>)
+                .MakeGenericType(typeof(T), typeof(T))
+                .GetMethod("Get")!
+                .Invoke(null, null)!;
+        }
+
+        ecs_type_hooks_t hooks = default;
+        hooks.ctor = hooksContext.Ctor == default ? default : &Functions.CtorCallback;
+        hooks.dtor = hooksContext.Dtor == default ? default : &Functions.DtorCallback;
+        hooks.copy = hooksContext.Copy == default ? default : &Functions.CopyCallback;
+        hooks.move = hooksContext.Move == default ? default : &Functions.MoveCallback;
+        hooks.on_add = hooksContext.OnAdd == default ? default : &Functions.OnAddCallback;
+        hooks.on_remove = hooksContext.OnRemove == default ? default : &Functions.OnRemoveCallback;
+        hooks.on_set = hooksContext.OnSet == default ? default : &Functions.OnSetCallback;
+        hooks.binding_ctx = Memory.Alloc(hooksContext);
+        hooks.binding_ctx_free = &Functions.TypeHooksContextFree;
+
+        ecs_set_hooks_id(world, component, &hooks);
+
+        return component;
+    }
+
+    /// <summary>
+    ///     Returns a trimmed version of this type's full name with respect to the current scope of the world.
+    /// </summary>
+    /// <param name="world">The world.</param>
+    public static string GetTrimmedTypeName(World world)
+    {
+        Entity scope = world.GetScope();
+
+        if (scope == 0)
+            return FullName;
+
+        string scopePath = scope.Path(initSep: "");
+
+        // If the the start of the type's full name matches the current scope's path, trim the scope's path
+        // from the full type name and return. Otherwise return only the name of the type.
+        return FullName.StartsWith(scopePath, StringComparison.Ordinal)
+            ? FullName[(scopePath.Length + 1)..]
+            : Name;
+    }
+
+    private static NativeArray<EnumMember> InitEnumCacheIndexes()
+    {
+        if (!IsEnum)
+            return default;
+
+        Array values = typeof(T).GetEnumValuesAsUnderlyingType();
+        NativeArray<EnumMember> constants = new NativeArray<EnumMember>(values.Length);
+
+        for (int i = 0; i < values.Length; i++)
+        {
+            long value = UnderlyingType switch
+            {
+                IntegerType.SByte => (sbyte)values.GetValue(i)!,
+                IntegerType.Byte => (byte)values.GetValue(i)!,
+                IntegerType.Int16 => (short)values.GetValue(i)!,
+                IntegerType.UInt16 => (ushort)values.GetValue(i)!,
+                IntegerType.Int32 => (int)values.GetValue(i)!,
+                IntegerType.UInt32 => (uint)values.GetValue(i)!,
+                IntegerType.Int64 => (long)values.GetValue(i)!,
+                IntegerType.UInt64 => (long)(ulong)values.GetValue(i)!,
+                _ => throw new Ecs.ErrorException("Type is not an enum.")
+            };
+            constants[i] = new EnumMember(value, Interlocked.Increment(ref Ecs.CacheIndexCount));
+        }
+
+        return constants;
+    }
+
+    private static void RegisterDotnetType(World world, Entity type)
+    {
+        ecs_suspend_readonly_state_t state = default;
+        world = flecs_suspend_readonly(world, &state);
+        type.Set(typeof(T));
+        flecs_resume_readonly(world, &state);
+    }
+
+    private static void RegisterConstants(World world, Entity type)
+    {
+        ecs_suspend_readonly_state_t state = default;
+        world = flecs_suspend_readonly(world, &state);
+
+        type.Set(new EcsEnum { underlying_type = UnderlyingTypeId });
+
+        Entity prevScope = world.SetScope(type);
+
+        for (int i = 0; i < Constants.Length; i++)
+        {
+            long value = Constants[i].Value;
+            string name = Unsafe.As<long, T>(ref value)!.ToString()!;
+            EnsureCacheIndex(world, Constants[i].CacheIndex) =
+                world.Entity(name).SetUntyped(EcsConstant, UnderlyingTypeId, sizeof(T), &value);
+        }
+
+        world.SetScope(prevScope);
+
+        flecs_resume_readonly(world, &state);
+    }
+
+    // Binary search enum list for enum constant's cache index.
+    private static int GetEnumCacheIndex<TEnum>(TEnum constant) where TEnum : Enum, T
+    {
+        long value = GetEnumConstantAsLong(constant);
+
+        int left = 0;
+        int right = Constants.Length - 1;
+
+        while (left <= right)
+        {
+            int mid = left + (right - left) / 2;
+
+            ref EnumMember data = ref Constants.Data[mid];
+
+            if (data.Value == value)
+                return data.CacheIndex;
+
+            if (data.Value < value)
+                left = ++mid;
+            else
+                right = --mid;
+        }
+
+        Ecs.Assert(false, $"No id registered for '{constant}'");
+        return 0;
+    }
+
+    private static long GetEnumConstantAsLong<TEnum>(TEnum constant) where TEnum : Enum, T
+    {
+        return UnderlyingType switch
+        {
+            IntegerType.SByte => Unsafe.As<TEnum, sbyte>(ref constant),
+            IntegerType.Byte => Unsafe.As<TEnum, byte>(ref constant),
+            IntegerType.Int16 => Unsafe.As<TEnum, short>(ref constant),
+            IntegerType.UInt16 => Unsafe.As<TEnum, ushort>(ref constant),
+            IntegerType.Int32 => Unsafe.As<TEnum, int>(ref constant),
+            IntegerType.UInt32 => Unsafe.As<TEnum, uint>(ref constant),
+            IntegerType.Int64 => Unsafe.As<TEnum, long>(ref constant),
+            IntegerType.UInt64 => (long)Unsafe.As<TEnum, ulong>(ref constant),
+            _ => throw new Ecs.ErrorException("Type is not an enum.")
+        };
+    }
+
+    private static IntegerType GetUnderlyingType()
+    {
+        if (!IsEnum)
+            return IntegerType.None;
+
+        Type underlyingType = typeof(T).GetEnumUnderlyingType();
+
+        if (underlyingType == typeof(sbyte))
+            return IntegerType.SByte;
+
+        if (underlyingType == typeof(byte))
+            return IntegerType.Byte;
+
+        if (underlyingType == typeof(short))
+            return IntegerType.Int16;
+
+        if (underlyingType == typeof(ushort))
+            return IntegerType.UInt16;
+
+        if (underlyingType == typeof(int))
+            return IntegerType.Int32;
+
+        if (underlyingType == typeof(uint))
+            return IntegerType.UInt32;
+
+        if (underlyingType == typeof(long))
+            return IntegerType.Int64;
+
+        if (underlyingType == typeof(ulong))
+            return IntegerType.UInt64;
+
+        return IntegerType.None;
+    }
+
+    private static ulong GetUnderlyingTypeId()
+    {
+        return UnderlyingType switch
+        {
+            IntegerType.SByte => FLECS_IDecs_i8_tID_,
+            IntegerType.Byte => FLECS_IDecs_u8_tID_,
+            IntegerType.Int16 => FLECS_IDecs_i16_tID_,
+            IntegerType.UInt16 => FLECS_IDecs_u16_tID_,
+            IntegerType.Int32 => FLECS_IDecs_i32_tID_,
+            IntegerType.UInt32 => FLECS_IDecs_u32_tID_,
+            IntegerType.Int64 => FLECS_IDecs_i64_tID_,
+            IntegerType.UInt64 => FLECS_IDecs_u64_tID_,
+            _ => 0
+        };
+    }
+
+    private static string GetName()
+    {
+        string fullname = GetFullName();
+
+        int trimEnd;
+
+        if (fullname.Contains('<', StringComparison.Ordinal))
+            trimEnd = fullname.LastIndexOf('.', fullname.IndexOf('<', StringComparison.Ordinal)) + 1;
+        else
+            trimEnd = fullname.LastIndexOf('.') + 1;
+
+        return fullname[trimEnd..];
+    }
+
+    private static string GetFullName()
+    {
+        string name = typeof(T).ToString();
+
+        // File-local types are prefixed with a file name + GUID.
+        if (Ecs.StripFileLocalTypeNameGuid)
+        {
+            int start = 0;
+            bool skip = false;
+
+            StringBuilder stringBuilder = new StringBuilder();
+
+            for (int current = 0; current < name.Length;)
+            {
+                char c = name[current];
+
+                if (skip && c == '_')
+                {
+                    skip = false;
+                    start = current + 2;
+                }
+                else if (!skip && c == '<')
+                {
+                    skip = true;
+                    stringBuilder.Append(name.AsSpan(start, current - start));
+                    current = name.IndexOf('>', current) + 1;
+                    continue;
+                }
+
+                current++;
+            }
+
+            stringBuilder.Append(name.AsSpan(start));
+            name = stringBuilder.ToString();
+        }
+
+        {
+            name = name
+                .Replace(Ecs.NativeNamespace, string.Empty, StringComparison.Ordinal)
+                .Replace('+', '.')
+                .Replace('[', '<')
+                .Replace(']', '>');
+
+            int start = 0;
+            int current = 0;
+            bool skip = false;
+
+            StringBuilder stringBuilder = new StringBuilder();
+
+            foreach (char c in name)
+            {
+                if (skip && (c == '<' || c == '.'))
+                {
+                    start = current;
+                    skip = false;
+                }
+                else if (!skip && c == '`')
+                {
+                    stringBuilder.Append(name.AsSpan(start, current - start));
+                    skip = true;
+                }
+
+                current++;
+            }
+
+            return stringBuilder.Append(name.AsSpan(start)).ToString();
+        }
+    }
+
+    // TODO: Change back to private when done debugging
+    public static int SizeOf()
+    {
+        NativeLayout(out int size, out int _);
+        return size;
+    }
+
+    private static int AlignOf()
+    {
+        NativeLayout(out int _, out int alignment);
+        return alignment;
+    }
+
+    [SuppressMessage("Usage", "CA1508")]
+    private static void NativeLayout(out int size, out int alignment)
+    {
+        Type type = typeof(T);
+        StructLayoutAttribute attribute = type.StructLayoutAttribute!;
+
+        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+        {
+            size = sizeof(GCHandle);
+            alignment = sizeof(GCHandle);
+            return;
+        }
+
+        if (attribute.Value == LayoutKind.Explicit)
+        {
+            size = attribute.Size == 0 ? sizeof(T) : attribute.Size;
+            alignment = attribute.Pack == 0 ? sizeof(AlignOfHelper) - sizeof(T) : attribute.Pack;
+        }
+        else
+        {
+            size = sizeof(T);
+            alignment = sizeof(AlignOfHelper) - sizeof(T);
+        }
+
+        if (RuntimeFeature.IsDynamicCodeSupported)
+        {
+            FieldInfo[] fields =
+                type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+            size = fields.Length == 0 ? 0 : size;
+            alignment = size == 0 ? 0 : alignment;
+        }
+        else if (sizeof(T) == 1)
+        {
+            // Structs containing zero non-static fields will always return true when compared using .Equals().
+            // Test for tags by changing the underlying byte and checking equality.
+            // If the structs always return true, it's likely that the struct is a tag.
+
+            T aInstance = default!;
+            T bInstance = default!;
+
+            for (byte i = 0; i < 16; i++)
+            {
+                *(byte*)&bInstance = i;
+                if (!Equals(aInstance, bInstance))
+                    return;
+            }
+
+            size = 0;
+            alignment = 0;
+        }
+    }
+
+    [SuppressMessage("ReSharper", "PrivateFieldCanBeConvertedToLocalVariable")]
+    [SuppressMessage("ReSharper", "NotAccessedPositionalProperty.Local")]
+    private readonly record struct AlignOfHelper(byte Dummy, T Data);
+
+    [SuppressMessage("ReSharper", "MemberHidesStaticFromOuterClass")]
+    private readonly record struct EnumMember(long Value, int CacheIndex);
+
+    /// <summary>
+    ///     Represents the underlying integer type of an enum.
+    /// </summary>
+    public enum IntegerType
+    {
+        /// <summary>
+        ///     This type is not an enum.
+        /// </summary>
+        None,
+
+        /// <summary>
+        ///     <see cref="sbyte"/>
+        /// </summary>
+        SByte,
+
+        /// <summary>
+        ///     <see cref="byte"/>
+        /// </summary>
+        Byte,
+
+        /// <summary>
+        ///     <see cref="short"/>
+        /// </summary>
+        Int16,
+
+        /// <summary>
+        ///     <see cref="ushort"/>
+        /// </summary>
+        UInt16,
+
+        /// <summary>
+        ///     <see cref="int"/>
+        /// </summary>
+        Int32,
+
+        /// <summary>
+        ///     <see cref="uint"/>
+        /// </summary>
+        UInt32,
+
+        /// <summary>
+        ///     <see cref="long"/>
+        /// </summary>
+        Int64,
+
+        /// <summary>
+        ///     <see cref="ulong"/>
+        /// </summary>
+        UInt64
+    }
+}
diff --git a/src/Flecs.NET/Core/World.cs b/src/Flecs.NET/Core/World.cs
index cf3d1e1b..5fd2d10f 100644
--- a/src/Flecs.NET/Core/World.cs
+++ b/src/Flecs.NET/Core/World.cs
@@ -1,4324 +1,4466 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using Flecs.NET.Core.BindingContext;
-using Flecs.NET.Utilities;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-/// <summary>
-///     The world is the container of all ECS data and systems. If the world is deleted, all data in the world will be
-///     deleted as well.
-/// </summary>
-public readonly unsafe partial struct World : IDisposable, IEquatable<World>
-{
-    private readonly ecs_world_t* _handle;
-
-    internal ref WorldContext WorldContext => ref *EnsureBindingContext();
-
-    /// <summary>
-    ///     The handle to the C world.
-    /// </summary>
-    public ref readonly ecs_world_t* Handle => ref _handle;
-
-    /// <summary>
-    ///     Constructs a world from an <see cref="ecs_world_t"/> pointer.
-    /// </summary>
-    /// <param name="handle">The world handle.</param>
-    public World(ecs_world_t* handle)
-    {
-        _handle = handle;
-    }
-
-    /// <summary>
-    ///     Creates a flecs world that is owned.
-    /// </summary>
-    /// <returns></returns>
-    public static World Create()
-    {
-        Ecs.Os.OverrideOsApi();
-
-        World w = new World(ecs_init());
-        w.EnsureBindingContext();
-        w.InitBuiltinComponents();
-
-        return w;
-    }
-
-    /// <summary>
-    ///     Creates a flecs world from an <see cref="ecs_world_t"/> pointer that is not owned.
-    /// </summary>
-    /// <param name="world">A C world.</param>
-    /// <returns>A newly created world.</returns>
-    public static World Create(ecs_world_t* world)
-    {
-        Ecs.Os.OverrideOsApi();
-
-        World w = new World(world);
-        w.EnsureBindingContext();
-        w.InitBuiltinComponents();
-
-        return w;
-    }
-
-    /// <summary>
-    ///     Creates world from command line arguments.
-    /// </summary>
-    /// <param name="args">Command line arguments.</param>
-    /// <returns></returns>
-    public static World Create(params Span<string> args)
-    {
-        NativeString* nativeStrings = Memory.AllocZeroed<NativeString>(args.Length);
-
-        for (int i = 0; i < args.Length; i++)
-            nativeStrings[i] = (NativeString)args[i];
-
-        Ecs.Os.OverrideOsApi();
-
-        World w = new World(ecs_init_w_args(args.Length, (byte**)nativeStrings));
-        w.EnsureBindingContext();
-        w.InitBuiltinComponents();
-
-        for (int i = 0; i < args.Length; i++)
-            nativeStrings[i].Dispose();
-
-        Memory.Free(nativeStrings);
-
-        return w;
-    }
-
-    /// <summary>
-    ///     Calls <see cref="ecs_fini"/> and cleans up resources.
-    /// </summary>
-    public void Dispose()
-    {
-        if (Handle == null || !Ecs.IsStageOrWorld(Handle))
-            return;
-
-        _ = ecs_fini(Handle);
-    }
-
-    /// <summary>
-    ///     Signals that the application should quit. The next call to <see cref="Progress"/> returns false.
-    /// </summary>
-    public void Quit()
-    {
-        ecs_quit(Handle);
-    }
-
-    /// <summary>
-    ///     Register action to be executed when world is destroyed.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    public void AtFini(Ecs.WorldFinishCallback callback)
-    {
-        WorldFinishContext* context = AllocateWorldFinishContext();
-        context->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.WorldFinishCallbackDelegate);
-        ecs_atfini(Handle, &Functions.WorldFinishCallback, context);
-    }
-
-    /// <summary>
-    ///     Register action to be executed when world is destroyed.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    public void AtFini(delegate*<World, void> callback)
-    {
-        WorldFinishContext* context = AllocateWorldFinishContext();
-        context->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.WorldFinishCallbackPointer);
-        ecs_atfini(Handle, &Functions.WorldFinishCallback, context);
-    }
-
-    /// <summary>
-    ///     Test if Quit() has been called.
-    /// </summary>
-    /// <returns></returns>
-    public bool ShouldQuit()
-    {
-        return ecs_should_quit(Handle);
-    }
-
-    /// <summary>
-    ///     Begin frame.
-    /// </summary>
-    /// <param name="deltaTime"></param>
-    /// <returns></returns>
-    public float FrameBegin(float deltaTime = 0)
-    {
-        return ecs_frame_begin(Handle, deltaTime);
-    }
-
-    /// <summary>
-    ///     End frame.
-    /// </summary>
-    public void FrameEnd()
-    {
-        ecs_frame_end(Handle);
-    }
-
-    /// <summary>
-    ///     Begin staging.
-    /// </summary>
-    /// <returns></returns>
-    public bool ReadonlyBegin(bool multiThreaded = false)
-    {
-        return ecs_readonly_begin(Handle, multiThreaded);
-    }
-
-    /// <summary>
-    ///     End staging.
-    /// </summary>
-    public void ReadonlyEnd()
-    {
-        ecs_readonly_end(Handle);
-    }
-
-    /// <summary>
-    ///     Defer operations until end end of frame, or until DeferEnd() is called.
-    /// </summary>
-    /// <returns></returns>
-    public bool DeferBegin()
-    {
-        return ecs_defer_begin(Handle);
-    }
-
-    /// <summary>
-    ///     End block of operations to defer.
-    /// </summary>
-    /// <returns></returns>
-    public bool DeferEnd()
-    {
-        return ecs_defer_end(Handle);
-    }
-
-    /// <summary>
-    ///     Test whether deferring is enabled.
-    /// </summary>
-    /// <returns></returns>
-    public bool IsDeferred()
-    {
-        return ecs_is_deferred(Handle);
-    }
-
-    /// <summary>
-    ///     Configure world to have N stages.
-    /// </summary>
-    /// <param name="stages"></param>
-    public void SetStageCount(int stages)
-    {
-        ecs_set_stage_count(Handle, stages);
-    }
-
-    /// <summary>
-    ///     Get number of configured stages.
-    /// </summary>
-    /// <returns></returns>
-    public int GetStageCount()
-    {
-        return ecs_get_stage_count(Handle);
-    }
-
-    /// <summary>
-    ///     Get current stage id.
-    /// </summary>
-    /// <returns></returns>
-    public int GetStageId()
-    {
-        return ecs_stage_get_id(Handle);
-    }
-
-    /// <summary>
-    ///     Test if is a stage.
-    /// </summary>
-    /// <returns></returns>
-    public bool IsStage()
-    {
-        Ecs.Assert(
-            flecs_poly_is_(Handle, ecs_world_t_magic) ||
-            flecs_poly_is_(Handle, ecs_stage_t_magic),
-            nameof(ECS_INVALID_PARAMETER)
-        );
-        return flecs_poly_is_(Handle, ecs_stage_t_magic);
-    }
-
-    /// <summary>
-    ///     Merge world or stage.
-    /// </summary>
-    public void Merge()
-    {
-        ecs_merge(Handle);
-    }
-
-    /// <summary>
-    ///     Get stage-specific world pointer.
-    /// </summary>
-    /// <param name="stageId"></param>
-    /// <returns></returns>
-    public World GetStage(int stageId)
-    {
-        return new World(ecs_get_stage(Handle, stageId));
-    }
-
-    /// <summary>
-    ///     Creates asynchronous stage.
-    /// </summary>
-    /// <returns></returns>
-    public World AsyncStage()
-    {
-        return new World(ecs_stage_new(Handle));
-    }
-
-    /// <summary>
-    ///     Get actual world.
-    /// </summary>
-    /// <returns></returns>
-    public World GetWorld()
-    {
-        return new World(Handle == null ? null : ecs_get_world(Handle));
-    }
-
-    /// <summary>
-    ///     Test whether the current world object is readonly.
-    /// </summary>
-    /// <returns></returns>
-    public bool IsReadOnly()
-    {
-        return ecs_stage_is_readonly(Handle);
-    }
-
-    /// <summary>
-    ///     Sets the user context object for the world.
-    /// </summary>
-    /// <param name="value">The user context object.</param>
-    /// <typeparam name="T">The user context type.</typeparam>
-    public void SetCtx<T>(T value)
-    {
-        WorldContext.UserContext.Set(ref value);
-    }
-
-    /// <summary>
-    ///     Sets the user context object for the world. The provided callback will be run before the
-    ///     user context object is released by flecs.
-    /// </summary>
-    /// <param name="value">The user context object.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The user context type.</typeparam>
-    public void SetCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        WorldContext.UserContext.Set(ref value, callback);
-    }
-
-    /// <summary>
-    ///     Sets the user context object for the world. The provided callback will be run before the
-    ///     user context object is released by flecs.
-    /// </summary>
-    /// <param name="value">The user context object.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The user context type.</typeparam>
-    public void SetCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        WorldContext.UserContext.Set(ref value, callback);
-    }
-
-    /// <summary>
-    ///     Gets the user context object for the world.
-    /// </summary>
-    /// <typeparam name="T">The user context type.</typeparam>
-    /// <returns></returns>
-    public ref T GetCtx<T>()
-    {
-        return ref WorldContext.UserContext.Get<T>();
-    }
-
-    /// <summary>
-    ///     Preallocate memory for number of entities.
-    /// </summary>
-    /// <param name="entityCount"></param>
-    public void Dim(int entityCount)
-    {
-        ecs_dim(Handle, entityCount);
-    }
-
-    /// <summary>
-    ///     Set entity range.
-    /// </summary>
-    /// <param name="min"></param>
-    /// <param name="max"></param>
-    public void SetEntityRange(ulong min, ulong max)
-    {
-        ecs_set_entity_range(Handle, min, max);
-    }
-
-    /// <summary>
-    ///     Enforce that operations cannot modify entities outside of range.
-    /// </summary>
-    /// <param name="enabled"></param>
-    public void EnableRangeCheck(bool enabled = true)
-    {
-        ecs_enable_range_check(Handle, enabled);
-    }
-
-    /// <summary>
-    ///     Set the current scope.
-    /// </summary>
-    /// <param name="scope">The entity to use as scope.</param>
-    /// <returns>The previous scope.</returns>
-    public Entity SetScope(ulong scope)
-    {
-        return new Entity(Handle, ecs_set_scope(Handle, scope));
-    }
-
-    /// <summary>
-    ///     Set the current scope.
-    /// </summary>
-    /// <typeparam name="T">The entity to use as scope.</typeparam>
-    /// <returns>The previous scope.</returns>
-    public Entity SetScope<T>()
-    {
-        return SetScope(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Set the current scope.
-    /// </summary>
-    /// <param name="value">The entity to use as scope.</param>
-    /// <typeparam name="T">The enum.</typeparam>
-    /// <returns>The previous scope.</returns>
-    public Entity SetScope<T>(T value) where T : Enum
-    {
-        return SetScope(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Get the current scope.
-    /// </summary>
-    /// <returns>The current scope.</returns>
-    public Entity GetScope()
-    {
-        return new Entity(Handle, ecs_get_scope(Handle));
-    }
-
-    /// <summary>
-    ///     Set search path.
-    /// </summary>
-    /// <param name="searchPath"></param>
-    /// <returns></returns>
-    public ulong* SetLookupPath(ulong* searchPath)
-    {
-        return ecs_set_lookup_path(Handle, searchPath);
-    }
-
-    /// <summary>
-    ///     Lookup entity by name.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="separator">The separator.</param>
-    /// <param name="rootSeparator">The root separator.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <returns>The entity if found, else 0.</returns>
-    public Entity Lookup(
-        string path,
-        string separator = Ecs.DefaultSeparator,
-        string rootSeparator = Ecs.DefaultSeparator,
-        bool recursive = true)
-    {
-        if (string.IsNullOrEmpty(path))
-            return new Entity(Handle, 0);
-
-        using NativeString nativePath = (NativeString)path;
-        using NativeString nativeSeparator = (NativeString)separator;
-        using NativeString nativeRootSeparator = (NativeString)rootSeparator;
-
-        return new Entity(
-            Handle,
-            ecs_lookup_path_w_sep(Handle, 0, nativePath, nativeSeparator, nativeRootSeparator, recursive)
-        );
-    }
-
-    /// <summary>
-    ///     Sets the data of a component.
-    /// </summary>
-    /// <param name="id">The id of the component to set.</param>
-    /// <param name="size">The size of the pointed-to data.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <returns>Reference to self.</returns>
-    public World SetUntyped(ulong id, int size, void* data)
-    {
-        Entity(id).SetUntyped(id, size, data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a component.
-    /// </summary>
-    /// <param name="id">The id of the component to set.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <returns>Reference to self.</returns>
-    public World SetUntyped(ulong id, void* data)
-    {
-        Entity(id).SetUntyped(id, data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a pair component.
-    /// </summary>
-    /// <param name="first">The first id of the pair.</param>
-    /// <param name="second">The second id of the pair.</param>
-    /// <param name="size">The size of the pointed-to data.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <returns>Reference to self.</returns>
-    public World SetUntyped(ulong first, ulong second, int size, void* data)
-    {
-        Entity(first).SetUntyped(first, second, size, data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton component.
-    /// </summary>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="T">The component type.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetPtr<T>(T* data)
-    {
-        Entity<T>().SetPtr(data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="second">The second id of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetPtr<TFirst>(ulong second, TFirst* data)
-    {
-        Entity<TFirst>().SetPtr(second, data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetPtr<TFirst, TSecond>(TFirst* data)
-    {
-        Entity<TFirst>().SetPtr<TFirst, TSecond>(data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetPtr<TFirst, TSecond>(TSecond* data)
-    {
-        Entity<TFirst>().SetPtr<TFirst, TSecond>(data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="second">The second id (enum member) of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetPtr<TFirst, TSecond>(TSecond second, TFirst* data) where TSecond : Enum
-    {
-        return SetPtr(Type<TSecond>.Id(Handle, second), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="first">The first id (enum member) of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetPtr<TFirst, TSecond>(TFirst first, TSecond* data) where TFirst : Enum
-    {
-        return SetPtrSecond(Type<TFirst>.Id(Handle, first), data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="first">The first id of the pair.</param>
-    /// <param name="data">The pointer to the data.</param>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetPtrSecond<TSecond>(ulong first, TSecond* data)
-    {
-        Entity(first).SetPtrSecond(first, data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton component.
-    /// </summary>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="T">The component type.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World Set<T>(in T data)
-    {
-        Entity<T>().Set(in data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="second">The second id of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World Set<TFirst>(ulong second, in TFirst data)
-    {
-        Entity<TFirst>().Set(second, in data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World Set<TFirst, TSecond>(in TFirst data)
-    {
-        Entity<TFirst>().Set<TFirst, TSecond>(in data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World Set<TFirst, TSecond>(in TSecond data)
-    {
-        Entity<TFirst>().Set<TFirst, TSecond>(in data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="second">The second id (enum member) of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World Set<TFirst, TSecond>(TSecond second, in TFirst data) where TSecond : Enum
-    {
-        return Set(Type<TSecond>.Id(Handle, second), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="first">The first id (enum member) of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World Set<TFirst, TSecond>(TFirst first, in TSecond data) where TFirst : Enum
-    {
-        return SetSecond(Type<TFirst>.Id(Handle, first), in data);
-    }
-
-    /// <summary>
-    ///     Sets the data of a singleton pair component.
-    /// </summary>
-    /// <param name="first">The first id of the pair.</param>
-    /// <param name="data">The component data.</param>
-    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
-    /// <returns>Reference to self.</returns>
-    public World SetSecond<TSecond>(ulong first, in TSecond data)
-    {
-        Entity(first).SetSecond(first, in data);
-        return this;
-    }
-
-    /// <summary>
-    ///     Ensure singleton component inside a callback.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public void Insert<T>(Ecs.InsertRefCallback<T> callback)
-    {
-        Invoker.Insert(Handle, Type<T>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* EnsurePtr<T>() where T : unmanaged
-    {
-        return Entity<T>().EnsurePtr<T>();
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public TFirst* EnsurePtr<TFirst>(ulong second) where TFirst : unmanaged
-    {
-        return Entity<TFirst>().EnsurePtr<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* EnsurePtr<TFirst, TSecond>(TSecond second)
-        where TFirst : unmanaged
-        where TSecond : Enum
-    {
-        return EnsurePtr<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* EnsurePtr<TFirst, TSecond>(TFirst first)
-        where TFirst : Enum
-        where TSecond : unmanaged
-    {
-        return EnsureSecondPtr<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* EnsureFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
-    {
-        return Entity<TFirst>().EnsureFirstPtr<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* EnsureSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
-    {
-        return Entity<TFirst>().EnsureSecondPtr<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* EnsureSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
-    {
-        return Entity(first).EnsureSecondPtr<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref T Ensure<T>()
-    {
-        return ref Entity<T>().Ensure<T>();
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref TFirst Ensure<TFirst>(ulong second)
-    {
-        return ref Entity<TFirst>().Ensure<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst Ensure<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Ensure<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond Ensure<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref EnsureSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst EnsureFirst<TFirst, TSecond>()
-    {
-        return ref Entity<TFirst>().EnsureFirst<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond EnsureSecond<TFirst, TSecond>()
-    {
-        return ref Entity<TFirst>().EnsureSecond<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond EnsureSecond<TSecond>(ulong first)
-    {
-        return ref Entity(first).EnsureSecond<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Mark singleton component as modified.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Modified<T>()
-    {
-        Entity<T>().Modified<T>();
-    }
-
-    /// <summary>
-    ///     Mark singleton pair as modified.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Modified<TFirst>(ulong second)
-    {
-        Entity<TFirst>().Modified<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Mark singleton pair as modified.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Modified<TFirst, TSecond>()
-    {
-        Entity<TFirst>().Modified<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Mark singleton pair as modified.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Modified<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Modified<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Mark singleton pair as modified.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Modified<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        ModifiedSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Mark singleton pair as modified.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    public void ModifiedSecond<TSecond>(ulong first)
-    {
-        Entity(first).ModifiedSecond<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Gets ref to singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Ref<T> GetRef<T>()
-    {
-        return Entity<T>().GetRef<T>();
-    }
-
-    /// <summary>
-    ///     Gets ref to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public Ref<TFirst> GetRef<TFirst>(ulong second)
-    {
-        return Entity<TFirst>().GetRef<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Gets ref to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TFirst> GetRef<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return GetRef<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Gets ref to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TSecond> GetRef<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return GetRefSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Gets ref to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TFirst> GetRefFirst<TFirst, TSecond>()
-    {
-        return Entity<TFirst>().GetRefFirst<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Gets ref to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TSecond> GetRefSecond<TFirst, TSecond>()
-    {
-        return Entity<TFirst>().GetRefSecond<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Gets ref to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Ref<TSecond> GetRefSecond<TSecond>(ulong first)
-    {
-        return Entity(first).GetRefSecond<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Gets pointer to singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* GetPtr<T>() where T : unmanaged
-    {
-        return Entity<T>().GetPtr<T>();
-    }
-
-    /// <summary>
-    ///     Gets pointer to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetPtr<TFirst>(ulong second) where TFirst : unmanaged
-    {
-        return Entity<TFirst>().GetPtr<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Gets pointer to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetPtr<TFirst, TSecond>(TSecond second)
-        where TFirst : unmanaged
-        where TSecond : Enum
-    {
-        return GetPtr<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Gets pointer to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetPtr<TFirst, TSecond>(TFirst first)
-        where TFirst : Enum
-        where TSecond : unmanaged
-    {
-        return GetSecondPtr<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Gets pointer to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
-    {
-        return Entity<TFirst>().GetFirstPtr<TFirst, TSecond>();
-    }
-
-
-    /// <summary>
-    ///     Gets pointer to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
-    {
-        return Entity<TFirst>().GetSecondPtr<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Gets pointer to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
-    {
-        return Entity(first).GetSecondPtr<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Gets managed reference to singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref readonly T Get<T>()
-    {
-        return ref Entity<T>().Get<T>();
-    }
-
-    /// <summary>
-    ///     Gets managed reference to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref readonly TFirst Get<TFirst>(ulong second)
-    {
-        return ref Entity<TFirst>().Get<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Gets managed reference to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TFirst Get<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref Get<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Gets managed reference to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TSecond Get<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref GetSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Gets managed reference to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TFirst GetFirst<TFirst, TSecond>()
-    {
-        return ref Entity<TFirst>().GetFirst<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Gets managed reference to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TSecond GetSecond<TFirst, TSecond>()
-    {
-        return ref Entity<TFirst>().GetSecond<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Gets managed reference to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref readonly TSecond GetSecond<TSecond>(ulong first)
-    {
-        return ref Entity(first).GetSecond<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public T* GetMutPtr<T>() where T : unmanaged
-    {
-        return Entity<T>().GetMutPtr<T>();
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetMutPtr<TFirst>(ulong second) where TFirst : unmanaged
-    {
-        return Entity<TFirst>().GetMutPtr<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetMutPtr<TFirst, TSecond>(TSecond second)
-        where TFirst : unmanaged
-        where TSecond : Enum
-    {
-        return GetMutPtr<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetMutPtr<TFirst, TSecond>(TFirst first)
-        where TFirst : Enum
-        where TSecond : unmanaged
-    {
-        return GetMutSecondPtr<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TFirst* GetMutFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
-    {
-        return Entity<TFirst>().GetMutFirstPtr<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetMutSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
-    {
-        return Entity<TFirst>().GetMutSecondPtr<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get mutable pointer to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public TSecond* GetMutSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
-    {
-        return Entity(first).GetMutSecondPtr<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ref T GetMut<T>()
-    {
-        return ref Entity<T>().GetMut<T>();
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public ref TFirst GetMut<TFirst>(ulong second)
-    {
-        return ref Entity<TFirst>().GetMut<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst GetMut<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return ref GetMut<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond GetMut<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return ref GetMutSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TFirst GetMutFirst<TFirst, TSecond>()
-    {
-        return ref Entity<TFirst>().GetMutFirst<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond GetMutSecond<TFirst, TSecond>()
-    {
-        return ref Entity<TFirst>().GetMutSecond<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get managed mutable reference to singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public ref TSecond GetMutSecond<TSecond>(ulong first)
-    {
-        return ref Entity(first).GetMutSecond<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Get a readonly singleton component inside a callback.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Read<T>(Ecs.ReadRefCallback<T> callback)
-    {
-        Invoker.Read(Handle, Type<T>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     Get a mutable singleton component inside a callback.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Write<T>(Ecs.WriteRefCallback<T> callback)
-    {
-        Invoker.Write(Handle, Type<T>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///      Test if world has singleton component.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public bool Has(ulong id)
-    {
-        return Entity(id).Has(id);
-    }
-
-    /// <summary>
-    ///     Test if world has singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public bool Has(ulong first, ulong second)
-    {
-        return Entity(first).Has(first, second);
-    }
-
-    /// <summary>
-    ///     Test if world has singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Has<T>()
-    {
-        return Entity<T>().Has<T>();
-    }
-
-    /// <summary>
-    ///     Test if world has singleton component.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool Has<T>(T value) where T : Enum
-    {
-        return Entity<T>().Has(value);
-    }
-
-    /// <summary>
-    ///     Test if world has singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst>(ulong second)
-    {
-        return Entity<TFirst>().Has<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Test if world has singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst, TSecond>()
-    {
-        return Entity<TFirst>().Has<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Test if world has singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Has<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Test if world has singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool Has<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return HasSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Test if world has singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public bool HasSecond<TSecond>(ulong first)
-    {
-        return Entity(first).Has(first, Type<TSecond>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Add singleton component.
-    /// </summary>
-    /// <param name="id"></param>
-    public void Add(ulong id)
-    {
-        Entity(id).Add(id);
-    }
-
-    /// <summary>
-    ///     Add singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    public void Add(ulong first, ulong second)
-    {
-        Entity(first).Add(first, second);
-    }
-
-    /// <summary>
-    ///     Add singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Add<T>()
-    {
-        Entity<T>().Add<T>();
-    }
-
-    /// <summary>
-    ///     Add singleton component.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Add<T>(T value) where T : Enum
-    {
-        Entity<T>().Add(value);
-    }
-
-    /// <summary>
-    ///     Add singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Add<TFirst>(ulong second)
-    {
-        Entity<TFirst>().Add<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Add singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Add<TFirst, TSecond>()
-    {
-        Entity<TFirst>().Add<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Add singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Add<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Add<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Add singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Add<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        AddSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Add singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    public void AddSecond<TSecond>(ulong first)
-    {
-        Entity(first).AddSecond<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Remove singleton id.
-    /// </summary>
-    /// <param name="id"></param>
-    public void Remove(ulong id)
-    {
-        Entity(id).Remove(id);
-    }
-
-    /// <summary>
-    ///     Remove singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    public void Remove(ulong first, ulong second)
-    {
-        Entity(first).Remove(first, second);
-    }
-
-    /// <summary>
-    ///     Remove singleton component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void Remove<T>()
-    {
-        Entity<T>().Remove<T>();
-    }
-
-    /// <summary>
-    ///     Remove singleton id.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Remove<T>(T value) where T : Enum
-    {
-        Entity<T>().Remove(value);
-    }
-
-    /// <summary>
-    ///     Remove singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Remove<TFirst>(ulong second)
-    {
-        Entity<TFirst>().Remove<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Remove singleton pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Remove<TFirst, TSecond>()
-    {
-        Entity<TFirst>().Remove<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Remove singleton pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Remove<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Remove<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Remove singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Remove<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        RemoveSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Remove singleton pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    public void RemoveSecond<TSecond>(ulong first)
-    {
-        Entity(first).Remove<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Iterate entities in root of world
-    /// </summary>
-    /// <param name="func"></param>
-    public void Children(Ecs.EachEntityCallback func)
-    {
-        Entity(0).Children(func);
-    }
-
-    /// <summary>
-    ///     Get singleton entity for type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Singleton<T>()
-    {
-        return Entity<T>();
-    }
-
-    /// <summary>
-    ///     Get target for a given pair from a singleton entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public Entity Target(ulong id, int index = 0)
-    {
-        return Entity(ecs_get_target(Handle, id, id, index));
-    }
-
-    /// <summary>
-    ///     Get target for a given pair from a singleton entity.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="rel"></param>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    public Entity Target(ulong id, ulong rel, int index = 0)
-    {
-        return Entity(ecs_get_target(Handle, id, rel, index));
-    }
-
-    /// <summary>
-    ///     Get target for a given pair from a singleton entity.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Target<T>(int index = 0)
-    {
-        return Entity(ecs_get_target(Handle, Type<T>.Id(Handle), Type<T>.Id(Handle), index));
-    }
-
-    /// <summary>
-    ///     Get target for a given pair from a singleton entity.
-    /// </summary>
-    /// <param name="rel"></param>
-    /// <param name="index"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Target<T>(ulong rel, int index = 0)
-    {
-        return Entity(ecs_get_target(Handle, Type<T>.Id(Handle), rel, index));
-    }
-
-    /// <summary>
-    ///     Get target for a given pair from a singleton entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="index"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Target<T>(T value, int index = 0) where T : Enum
-    {
-        return Entity(ecs_get_target(Handle, Entity(value), Entity(value), index));
-    }
-
-    /// <summary>
-    ///     Get target for a given pair from a singleton entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="rel"></param>
-    /// <param name="index"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Target<T>(T value, ulong rel, int index = 0) where T : Enum
-    {
-        return Entity(ecs_get_target(Handle, Entity(value), rel, index));
-    }
-
-    /// <summary>
-    ///     Creates alias for component.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <param name="alias"></param>
-    public Entity Use(ulong entity, string alias = "")
-    {
-        if (string.IsNullOrEmpty(alias))
-            alias = NativeString.GetString(ecs_get_name(Handle, entity));
-
-        using NativeString nativeAlias = (NativeString)alias;
-        ecs_set_alias(Handle, entity, nativeAlias);
-        return Entity(entity);
-    }
-
-    /// <summary>
-    ///     Creates alias for component.
-    /// </summary>
-    /// <param name="alias"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Use<T>(string alias = "")
-    {
-        ulong entity = Type<T>.Id(Handle);
-
-        if (string.IsNullOrEmpty(alias))
-            alias = NativeString.GetString(ecs_get_name(Handle, entity));
-
-        using NativeString nativeAlias = (NativeString)alias;
-
-        ecs_set_alias(Handle, entity, nativeAlias);
-        return Entity(entity);
-    }
-
-    /// <summary>
-    ///     Creates alias for component.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="alias"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Use<T>(T value, string alias = "") where T : Enum
-    {
-        return Use(Type<T>.Id(Handle, value), alias);
-    }
-
-    /// <summary>
-    ///     Creates alias for component.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <param name="alias"></param>
-    /// <returns></returns>
-    public Entity Use(string name, string alias = "")
-    {
-        using NativeString nativeName = (NativeString)name;
-
-        ulong entity = ecs_lookup_path_w_sep(Handle, 0, nativeName,
-            Pointers.DefaultSeparator, Pointers.DefaultSeparator, true);
-
-        Ecs.Assert(entity != 0, nameof(ECS_INVALID_PARAMETER));
-
-        using NativeString nativeAlias = (NativeString)alias;
-
-        ecs_set_alias(Handle, entity, nativeAlias);
-        return Entity(entity);
-    }
-
-    /// <summary>
-    ///     Count entities matching a component.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public int Count(ulong id)
-    {
-        return ecs_count_id(Handle, id);
-    }
-
-    /// <summary>
-    ///     Count entities matching a pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public int Count(ulong first, ulong second)
-    {
-        return Count(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Count entities matching a component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public int Count<T>()
-    {
-        return Count(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Count entities matching a component.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public int Count<T>(T value) where T : Enum
-    {
-        return Count<T>(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Count entities matching a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public int Count<TFirst>(ulong second)
-    {
-        return Count(Ecs.Pair<TFirst>(second, Handle));
-    }
-
-    /// <summary>
-    ///     Count entities matching a pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public int Count<TFirst, TSecond>()
-    {
-        return Count(Ecs.Pair<TFirst, TSecond>(Handle));
-    }
-
-    /// <summary>
-    ///     Count entities matching a pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public int Count<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Count<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Count entities matching a pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public int Count<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return CountSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Count entities matching a pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public int CountSecond<TSecond>(ulong first)
-    {
-        return Count(first, Type<TSecond>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with id.
-    /// </summary>
-    /// <param name="id">Id to be added to the created entities.</param>
-    /// <param name="callback">The callback.</param>
-    public void With(ulong id, Action callback)
-    {
-        ulong prev = ecs_set_with(Handle, id);
-        callback();
-        ecs_set_with(Handle, prev);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="first">The first id.</param>
-    /// <param name="second">The second id.</param>
-    /// <param name="callback">The callback.</param>
-    public void With(ulong first, ulong second, Action callback)
-    {
-        With(Ecs.Pair(first, second), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with type.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The component.</typeparam>
-    public void With<T>(Action callback)
-    {
-        With(Type<T>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with enum.
-    /// </summary>
-    /// <param name="value">The enum constant.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The enum.</typeparam>
-    public void With<T>(T value, Action callback) where T : Enum
-    {
-        With<T>(Type<T>.Id(Handle, value), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="second">The second id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first component.</typeparam>
-    public void With<TFirst>(ulong second, Action callback)
-    {
-        With(Ecs.Pair<TFirst>(second, Handle), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first component.</typeparam>
-    /// <typeparam name="TSecond">The second component.</typeparam>
-    public void With<TFirst, TSecond>(Action callback)
-    {
-        With(Ecs.Pair<TFirst, TSecond>(Handle), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="second">The second enum constant id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first component.</typeparam>
-    /// <typeparam name="TSecond">The second enum.</typeparam>
-    public void With<TFirst, TSecond>(TSecond second, Action callback) where TSecond : Enum
-    {
-        With<TFirst>(Type<TSecond>.Id(Handle, second), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="first">The first enum constant.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first enum.</typeparam>
-    /// <typeparam name="TSecond">The second component.</typeparam>
-    public void With<TFirst, TSecond>(TFirst first, Action callback) where TFirst : Enum
-    {
-        WithSecond<TSecond>(Type<TFirst>.Id(Handle, first), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="first">The first id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TSecond">The second component.</typeparam>
-    public void WithSecond<TSecond>(ulong first, Action callback)
-    {
-        With(first, Type<TSecond>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created in scope. All operations
-    ///     called in function (such as lookup) are relative to scope.
-    /// </summary>
-    /// <param name="parent">The entity to use as scope.</param>
-    /// <param name="callback">The callback.</param>
-    public void Scope(ulong parent, Action callback)
-    {
-        ulong prev = ecs_set_scope(Handle, parent);
-        callback();
-        ecs_set_scope(Handle, prev);
-    }
-
-    /// <summary>
-    ///     Same as Scope(parent, callback), but with T as parent.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The entity to use as scope.</typeparam>
-    public void Scope<T>(Action callback)
-    {
-        Scope(Type<T>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     Same as Scope(parent, callback), but with enum as parent.
-    /// </summary>
-    /// <param name="value">The entity to use as scope.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The enum.</typeparam>
-    public void Scope<T>(T value, Action callback) where T : Enum
-    {
-        Scope(Type<T>.Id(Handle, value), callback);
-    }
-
-    /// <summary>
-    ///     Use provided scope for operations ran on returned world.
-    /// </summary>
-    /// <param name="parent"></param>
-    /// <returns></returns>
-    public ScopedWorld Scope(ulong parent)
-    {
-        return new ScopedWorld(Handle, parent);
-    }
-
-    /// <summary>
-    ///     Use provided scope for operations ran on returned world.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ScopedWorld Scope<T>()
-    {
-        return Scope(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Use provided scope for operations ran on returned world.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public ScopedWorld Scope<T>(T value) where T : Enum
-    {
-        return Scope(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Use provided scope for operations ran on returned world.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public ScopedWorld Scope(string name)
-    {
-        return Scope(Entity(name));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified id.
-    /// </summary>
-    /// <param name="id"></param>
-    public void DeleteWith(ulong id)
-    {
-        ecs_delete_with(Handle, id);
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    public void DeleteWith(ulong first, ulong second)
-    {
-        DeleteWith(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void DeleteWith<T>()
-    {
-        DeleteWith(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified enum.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    public void DeleteWith<T>(T value) where T : Enum
-    {
-        DeleteWith<T>(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void DeleteWith<TFirst>(ulong second)
-    {
-        DeleteWith(Ecs.Pair<TFirst>(second, Handle));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void DeleteWith<TFirst, TSecond>()
-    {
-        DeleteWith(Ecs.Pair<TFirst, TSecond>(Handle));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void DeleteWith<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        DeleteWith<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void DeleteWith<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        DeleteWithSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Delete all entities with specified pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    public void DeleteWithSecond<TSecond>(ulong first)
-    {
-        DeleteWith(Ecs.PairSecond<TSecond>(first, Handle));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified id.
-    /// </summary>
-    /// <param name="id"></param>
-    public void RemoveAll(ulong id)
-    {
-        ecs_remove_all(Handle, id);
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    public void RemoveAll(ulong first, ulong second)
-    {
-        RemoveAll(Ecs.Pair(first, second));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void RemoveAll<T>()
-    {
-        RemoveAll(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified enum.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    public void RemoveAll<T>(T value) where T : Enum
-    {
-        RemoveAll<T>(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void RemoveAll<TFirst>(ulong second)
-    {
-        RemoveAll(Ecs.Pair<TFirst>(second, Handle));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified pair.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void RemoveAll<TFirst, TSecond>()
-    {
-        RemoveAll(Ecs.Pair<TFirst, TSecond>(Handle));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void RemoveAll<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        RemoveAll<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void RemoveAll<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        RemoveAllSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Remove all instances of specified pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    public void RemoveAllSecond<TSecond>(ulong first)
-    {
-        RemoveAll(Ecs.PairSecond<TSecond>(first, Handle));
-    }
-
-    /// <summary>
-    ///     Defer all operations called in function. If the world is already in
-    ///     deferred mode, do nothing.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    public void Defer(Action callback)
-    {
-        ecs_defer_begin(Handle);
-        callback();
-        ecs_defer_end(Handle);
-    }
-
-    /// <summary>
-    ///     Suspend deferring operations.
-    /// </summary>
-    public void DeferSuspend()
-    {
-        ecs_defer_suspend(Handle);
-    }
-
-    /// <summary>
-    ///     Resume deferring operations.
-    /// </summary>
-    public void DeferResume()
-    {
-        ecs_defer_resume(Handle);
-    }
-
-    /// <summary>
-    ///     Check if entity id exists in the world.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public bool Exists(ulong entity)
-    {
-        return ecs_exists(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Check if entity id exists in the world.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public bool IsAlive(ulong entity)
-    {
-        return ecs_is_alive(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Check if entity id is valid.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public bool IsValid(ulong entity)
-    {
-        return ecs_is_valid(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Get alive entity for id.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public Entity GetAlive(ulong entity)
-    {
-        return Entity(ecs_get_alive(Handle, entity));
-    }
-
-    /// <summary>
-    ///     Ensures that entity with provided generation is alive.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public Entity MakeAlive(ulong entity)
-    {
-        ecs_make_alive(Handle, entity);
-        return Entity(entity);
-    }
-
-    /// <summary>
-    ///     Override the generation of an entity.
-    /// </summary>
-    /// <param name="entity">The entity for which to set the generation with the new generation.</param>
-    public void SetVersion(ulong entity)
-    {
-        ecs_set_version(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Run callback after completing frame.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    public void RunPostFrame(Ecs.PostFrameCallback callback)
-    {
-        PostFrameContext* postFrameContext = AllocatePostFrameContext();
-        postFrameContext->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.PostFrameCallbackDelegate);
-        ecs_run_post_frame(Handle, &Functions.PostFrameCallback, postFrameContext);
-    }
-
-    /// <summary>
-    ///     Run callback after completing frame.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    public void RunPostFrame(delegate*<World, void> callback)
-    {
-        PostFrameContext* postFrameContext = AllocatePostFrameContext();
-        postFrameContext->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.PostFrameCallbackPointer);
-        ecs_run_post_frame(Handle, &Functions.PostFrameCallback, postFrameContext);
-    }
-
-    /// <summary>
-    ///     Get the world info.
-    /// </summary>
-    /// <returns></returns>
-    public WorldInfo GetInfo()
-    {
-        return new WorldInfo(ecs_get_world_info(Handle));
-    }
-
-    /// <summary>
-    ///     Get delta time.
-    /// </summary>
-    /// <returns></returns>
-    public float DeltaTime()
-    {
-        return ecs_get_world_info(Handle)->delta_time;
-    }
-
-    /// <summary>
-    ///     Get default id.
-    /// </summary>
-    /// <returns></returns>
-    [SuppressMessage("Usage", "CA1822")]
-    public Id Id()
-    {
-        return default;
-    }
-
-    /// <summary>
-    ///     Get id from string expression.
-    /// </summary>
-    /// <param name="expr">The string expression.</param>
-    /// <returns></returns>
-    public Id Id(string expr)
-    {
-        return new Id(Handle, expr);
-    }
-
-    /// <summary>
-    ///     Get id from id value.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public Id Id(ulong id)
-    {
-        return new Id(Handle, id);
-    }
-
-    /// <summary>
-    ///     Get pair from id values.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public Id Id(ulong first, ulong second)
-    {
-        return new Id(Handle, first, second);
-    }
-
-    /// <summary>
-    ///     Get id from a type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Id Id<T>()
-    {
-        return new Id(Handle, Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Get id from an enum.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Id Id<T>(T value) where T : Enum
-    {
-        return new Id(Handle, Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public Id Id<TFirst>(ulong second)
-    {
-        return Id(Type<TFirst>.Id(Handle), second);
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id Id<TFirst, TSecond>()
-    {
-        return Id(Type<TFirst>.Id(Handle), Type<TSecond>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id Id<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Id<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id Id<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return IdSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id IdSecond<TSecond>(ulong first)
-    {
-        return Id(first, Type<TSecond>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public Id Pair(ulong first, ulong second)
-    {
-        return Id(first, second);
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Id Pair<T>(T value) where T : Enum
-    {
-        return Id<T>(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public Id Pair<TFirst>(ulong second)
-    {
-        return Id<TFirst>(second);
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id Pair<TFirst, TSecond>()
-    {
-        return Id<TFirst, TSecond>();
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id Pair<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Pair<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id Pair<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return PairSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Get pair id.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Id PairSecond<TSecond>(ulong first)
-    {
-        return IdSecond<TSecond>(first);
-    }
-
-    /// <summary>
-    ///     Creates an <see cref="UntypedComponent"/>.
-    /// </summary>
-    /// <returns></returns>
-    public UntypedComponent Component()
-    {
-        return new UntypedComponent(Handle);
-    }
-
-    /// <summary>
-    ///     Creates an <see cref="UntypedComponent"/> from id.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public UntypedComponent Component(ulong id)
-    {
-        return new UntypedComponent(Handle, id);
-    }
-
-    /// <summary>
-    ///     Creates an <see cref="UntypedComponent"/> from name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public UntypedComponent Component(string name)
-    {
-        return new UntypedComponent(Handle, name);
-    }
-
-    /// <summary>
-    ///     Find or register component.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Component<T> Component<T>()
-    {
-        return new Component<T>(Handle);
-    }
-
-    /// <summary>
-    ///     Get component associated with name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Component<T> Component<T>(string name)
-    {
-        return new Component<T>(Handle, name);
-    }
-
-    /// <summary>
-    ///     Get component with associated with id.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Component<T> Component<T>(ulong id)
-    {
-        return new Component<T>(Handle, id);
-    }
-
-    /// <summary>
-    ///     Creates an entity.
-    /// </summary>
-    /// <returns></returns>
-    public Entity Entity()
-    {
-        return new Entity(Handle);
-    }
-
-    /// <summary>
-    ///     Creates an entity from id.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public Entity Entity(ulong id)
-    {
-        return new Entity(Handle, id);
-    }
-
-    /// <summary>
-    ///     Creates an entity from name.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public Entity Entity(string name)
-    {
-        return new Entity(Handle, name);
-    }
-
-    /// <summary>
-    ///     Creates an entity from type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Entity<T>()
-    {
-        return new Entity(Handle, Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Creates an entity that's associated with a type.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Entity<T>(string name)
-    {
-        return new Entity(Handle, Type<T>.Id(Handle, false, false, 0, name));
-    }
-
-    /// <summary>
-    ///     Convert enum constant to entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Entity<T>(T value) where T : Enum
-    {
-        return new Entity(Handle, Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Creates a prefab.
-    /// </summary>
-    /// <returns></returns>
-    public Entity Prefab()
-    {
-        return new Entity(Handle).Add(EcsPrefab);
-    }
-
-    /// <summary>
-    ///     Creates a prefab with the provided name.
-    /// </summary>
-    /// <returns></returns>
-    public Entity Prefab(string name)
-    {
-        return new Entity(Handle, name).Add(EcsPrefab);
-    }
-
-    /// <summary>
-    ///     Creates a prefab that's associated with a type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Prefab<T>()
-    {
-        return new Component<T>(Handle).Add(EcsPrefab);
-    }
-
-    /// <summary>
-    ///     Creates a prefab that's associated with a type.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Prefab<T>(string name)
-    {
-        return new Component<T>(Handle, name).Add(EcsPrefab);
-    }
-
-    /// <summary>
-    ///     Creates a new event.
-    /// </summary>
-    /// <param name="eventId"></param>
-    /// <returns></returns>
-    public EventBuilder Event(ulong eventId)
-    {
-        return new EventBuilder(Handle, eventId);
-    }
-
-    /// <summary>
-    ///     Creates a new event.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public EventBuilder Event<T>()
-    {
-        return new EventBuilder(Handle, Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Creates a new event.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public EventBuilder Event<T>(T value) where T : Enum
-    {
-        return new EventBuilder(Handle, Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <returns></returns>
-    public Term Term()
-    {
-        return new Term(Handle);
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public Term Term(ecs_term_t value)
-    {
-        return new Term(Handle, value);
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public Term Term(ulong id)
-    {
-        return new Term(Handle, id);
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <returns></returns>
-    public Term Term(ulong first, ulong second)
-    {
-        return new Term(Handle, first, second);
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Term Term<T>()
-    {
-        return new Term(Handle, Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Term Term<T>(T value) where T : Enum
-    {
-        return Term<T>(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <returns></returns>
-    public Term Term<TFirst>(ulong second)
-    {
-        return new Term(Handle, Ecs.Pair<TFirst>(second, Handle));
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Term Term<TFirst, TSecond>()
-    {
-        return new Term(Handle, Ecs.Pair<TFirst, TSecond>(Handle));
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Term Term<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        return Term<TFirst>(Type<TSecond>.Id(Handle, second));
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Term Term<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        return TermSecond<TSecond>(Type<TFirst>.Id(Handle, first));
-    }
-
-    /// <summary>
-    ///     Creates a new term.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    /// <returns></returns>
-    public Term TermSecond<TSecond>(ulong first)
-    {
-        return new Term(Handle, Ecs.PairSecond<TSecond>(first, Handle));
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided (component) id.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="callback"></param>
-    public void Each(ulong id, Ecs.EachEntityCallback callback)
-    {
-        ecs_iter_t it = ecs_each_id(Handle, id);
-        while (ecs_each_next(&it))
-            Invoker.Each(&it, callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="second"></param>
-    /// <param name="callback"></param>
-    public void Each(ulong first, ulong second, Ecs.EachEntityCallback callback)
-    {
-        Each(Ecs.Pair(first, second), callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="callback"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Each<T>(T value, Ecs.EachEntityRefCallback<T> callback) where T : Enum
-    {
-        Each(Type<T>.Id(Handle, value), callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    public void Each<TFirst>(ulong second, Ecs.EachEntityRefCallback<TFirst> callback)
-    {
-        ecs_iter_t it = ecs_each_id(Handle, Ecs.Pair<TFirst>(second, Handle));
-        while (ecs_each_next(&it))
-            Invoker.Each(&it, callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Each<TFirst, TSecond>(Ecs.EachEntityCallback callback)
-    {
-        Each(Pair<TFirst, TSecond>(), callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Each<TFirst, TSecond>(Ecs.EachEntityRefCallback<TFirst> callback)
-    {
-        Each(Type<TSecond>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Each<TFirst, TSecond>(Ecs.EachEntityRefCallback<TSecond> callback)
-    {
-        EachSecond(Type<TFirst>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="second"></param>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Each<TFirst, TSecond>(TSecond second, Ecs.EachEntityRefCallback<TFirst> callback) where TSecond : Enum
-    {
-        Each(Type<TSecond>.Id(Handle, second), callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="callback"></param>
-    /// <typeparam name="TFirst"></typeparam>
-    /// <typeparam name="TSecond"></typeparam>
-    public void Each<TFirst, TSecond>(TFirst first, Ecs.EachEntityRefCallback<TSecond> callback) where TFirst : Enum
-    {
-        EachSecond(Type<TFirst>.Id(Handle, first), callback);
-    }
-
-    /// <summary>
-    ///     Iterate over all entities with the provided pair.
-    /// </summary>
-    /// <param name="first"></param>
-    /// <param name="callback"></param>
-    /// <typeparam name="TSecond"></typeparam>
-    public void EachSecond<TSecond>(ulong first, Ecs.EachEntityRefCallback<TSecond> callback)
-    {
-        ecs_iter_t it = ecs_each_id(Handle, Ecs.PairSecond<TSecond>(first, Handle));
-        while (ecs_each_next(&it))
-            Invoker.Each(&it, callback);
-    }
-
-    /// <summary>
-    ///     Convert enum constant to entity.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity ToEntity<T>(T value) where T : Enum
-    {
-        return Entity(value);
-    }
-
-    /// <summary>
-    ///     Define a module.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <typeparam name="TModule"></typeparam>
-    /// <returns></returns>
-    public Entity Module<TModule>(string name = "") where TModule : IFlecsModule, new()
-    {
-        Entity result = Entity(Type<TModule>.Id(Handle));
-
-        if (string.IsNullOrEmpty(name))
-            return Entity(result);
-
-        using NativeString nativeName = (NativeString)name;
-
-        Entity prevParent = result.Parent();
-        ecs_add_path_w_sep(Handle, result, 0, nativeName, Pointers.DefaultSeparator, Pointers.DefaultSeparator);
-        Entity parent = result.Parent();
-
-        if (prevParent == parent)
-            return Entity(result);
-
-        if (parent != 0)
-            parent.Add(Ecs.Module);
-
-        // Module was reparented, cleanup old parent(s)
-        Entity current = prevParent;
-
-        while (current != 0)
-        {
-            Entity next = current.Parent();
-
-            ecs_iter_t it = ecs_each_id(Handle, Pair(Ecs.ChildOf, current));
-
-            if (!ecs_iter_is_true(&it))
-            {
-                current.Destruct();
-                SetVersion(current);
-            }
-
-            current = next;
-        }
-
-        return Entity(result);
-    }
-
-    /// <summary>
-    ///     Imports a module.
-    /// </summary>
-    /// <typeparam name="T">The module type.</typeparam>
-    /// <returns>The module entity.</returns>
-    public Entity Import<T>() where T : IFlecsModule, new()
-    {
-        return Ecs.Import<T>(this);
-    }
-
-    /// <summary>
-    ///     Set pipeline.
-    /// </summary>
-    /// <param name="pipeline"></param>
-    public void SetPipeline(ulong pipeline)
-    {
-        ecs_set_pipeline(Handle, pipeline);
-    }
-
-    /// <summary>
-    ///     Set pipeline.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public void SetPipeline<T>()
-    {
-        SetPipeline(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Set pipeline.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    public void SetPipeline<T>(T value) where T : Enum
-    {
-        SetPipeline(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Get pipeline.
-    /// </summary>
-    /// <returns></returns>
-    public Entity GetPipeline()
-    {
-        return Entity(ecs_get_pipeline(Handle));
-    }
-
-    /// <summary>
-    ///     Progress world one tick.
-    /// </summary>
-    /// <returns></returns>
-    public bool Progress(float deltaTime = 0)
-    {
-        return ecs_progress(Handle, deltaTime);
-    }
-
-    /// <summary>
-    ///     Run pipeline.
-    /// </summary>
-    /// <param name="pipeline"></param>
-    /// <param name="deltaTime"></param>
-    public void RunPipeline(ulong pipeline, float deltaTime = 0)
-    {
-        ecs_run_pipeline(Handle, pipeline, deltaTime);
-    }
-
-    /// <summary>
-    ///     Run pipeline.
-    /// </summary>
-    /// <param name="deltaTime"></param>
-    /// <typeparam name="TPipeline"></typeparam>
-    public void RunPipeline<TPipeline>(float deltaTime = 0)
-    {
-        ecs_run_pipeline(Handle, Type<TPipeline>.Id(Handle), deltaTime);
-    }
-
-    /// <summary>
-    ///     Set timescale.
-    /// </summary>
-    /// <param name="scale"></param>
-    public void SetTimeScale(float scale)
-    {
-        ecs_set_time_scale(Handle, scale);
-    }
-
-    /// <summary>
-    ///     Set target FPS.
-    /// </summary>
-    /// <param name="targetFps"></param>
-    public void SetTargetFps(float targetFps)
-    {
-        ecs_set_target_fps(Handle, targetFps);
-    }
-
-    /// <summary>
-    ///     Reset simulation clock.
-    /// </summary>
-    public void ResetClock()
-    {
-        ecs_reset_clock(Handle);
-    }
-
-    /// <summary>
-    ///     Set number of threads.
-    /// </summary>
-    /// <param name="threads"></param>
-    public void SetThreads(int threads)
-    {
-        ecs_set_threads(Handle, threads);
-    }
-
-    /// <summary>
-    ///     Set number of threads.
-    /// </summary>
-    /// <returns></returns>
-    public int GetThreads()
-    {
-        return ecs_get_stage_count(Handle);
-    }
-
-    /// <summary>
-    ///     Set number of task threads.
-    /// </summary>
-    /// <param name="taskThreads"></param>
-    public void SetTaskThreads(int taskThreads)
-    {
-        ecs_set_task_threads(Handle, taskThreads);
-    }
-
-    /// <summary>
-    ///     Returns true if task thread use has been requested.
-    /// </summary>
-    /// <returns></returns>
-    public bool UsingTaskThreads()
-    {
-        return ecs_using_task_threads(Handle);
-    }
-
-    /// <summary>
-    ///     Creates a timer.
-    /// </summary>
-    /// <returns></returns>
-    public TimerEntity Timer()
-    {
-        return new TimerEntity(Handle);
-    }
-
-    /// <summary>
-    ///     Creates a timer.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public TimerEntity Timer(ulong id)
-    {
-        return new TimerEntity(Handle, id);
-    }
-
-    /// <summary>
-    ///     Creates a timer.
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public TimerEntity Timer(string name)
-    {
-        return new TimerEntity(Handle, name);
-    }
-
-    /// <summary>
-    ///     Creates a timer.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public TimerEntity Timer<T>()
-    {
-        return Timer(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Creates a timer.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    public void Timer<T>(T value) where T : Enum
-    {
-        Timer(Type<T>.Id(Handle, value));
-    }
-
-    /// <summary>
-    ///     Enable randomization of initial time values for timers.
-    /// </summary>
-    public void RandomizeTimers()
-    {
-        ecs_randomize_timers(Handle);
-    }
-
-    /// <summary>
-    ///     Run script.
-    /// </summary>
-    /// <param name="name">The script name (typically the file).</param>
-    /// <param name="str">The script.</param>
-    /// <returns>Zero if success, non-zero otherwise.</returns>
-    public int ScriptRun(string name, string str)
-    {
-        using NativeString nativeName = (NativeString)name;
-        using NativeString nativeStr = (NativeString)str;
-
-        return ecs_script_run(Handle, nativeName, nativeStr);
-    }
-
-    /// <summary>
-    ///     Run script from file.
-    /// </summary>
-    /// <param name="fileName">The script file name.</param>
-    /// <returns>Zero if success, non-zero if failed.</returns>
-    public int ScriptRunFile(string fileName)
-    {
-        using NativeString nativeFileName = (NativeString)fileName;
-        return ecs_script_run_file(Handle, nativeFileName);
-    }
-
-    /// <summary>
-    ///     Creates a script builder.
-    /// </summary>
-    /// <returns>The created script builder.</returns>
-    public ScriptBuilder Script()
-    {
-        return new ScriptBuilder(Handle);
-    }
-
-    /// <summary>
-    ///     Creates a script builder with the provided entity name.
-    /// </summary>
-    /// <param name="name">The entity name.</param>
-    /// <returns>The created script builder.</returns>
-    public ScriptBuilder Script(string name)
-    {
-        return new ScriptBuilder(Handle, name);
-    }
-
-    /// <summary>
-    ///     Convert value to string.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public string ToExpr(ulong id, void* value)
-    {
-        return NativeString.GetStringAndFree(ecs_ptr_to_expr(Handle, id, value));
-    }
-
-    /// <summary>
-    ///     Convert value to string.
-    /// </summary>
-    /// <param name="value">The value to serialize.</param>
-    /// <typeparam name="T">The type of the value to serialize.</typeparam>
-    /// <returns>String with expression, or empty string if failed.</returns>
-    public string ToExpr<T>(T* value) where T : unmanaged
-    {
-        return ToExpr(Type<T>.Id(Handle), value);
-    }
-
-    /// <summary>
-    ///     Covert value to string.
-    /// </summary>
-    /// <param name="value">The value to serialize.</param>
-    /// <typeparam name="T">The type of the value to serialize.</typeparam>
-    /// <returns>String with expression, or empty string if failed.</returns>
-    public string ToExpr<T>(ref T value) where T : unmanaged
-    {
-        fixed (T* ptr = &value)
-        {
-            return ToExpr(ptr);
-        }
-    }
-
-    /// <summary>
-    ///     Return meta cursor to value.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    public Cursor Cursor(ulong id, void* data)
-    {
-        return new Cursor(Handle, id, data);
-    }
-
-    /// <summary>
-    ///     Return meta cursor to value.
-    /// </summary>
-    /// <param name="data"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Cursor Cursor<T>(T* data)
-    {
-        return Cursor(Type<T>.Id(Handle), data);
-    }
-
-    /// <summary>
-    ///     Return meta cursor to value.
-    /// </summary>
-    /// <param name="data"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    // TODO: Figure out better api that doesn't cause GC hole
-    public Cursor Cursor<T>(ref T data) where T : unmanaged
-    {
-        fixed (T* ptr = &data)
-        {
-            return Cursor(ptr);
-        }
-    }
-
-    /// <summary>
-    ///     Create primitive type.
-    /// </summary>
-    /// <param name="kind"></param>
-    /// <returns></returns>
-    public Entity Primitive(ecs_primitive_kind_t kind)
-    {
-        ecs_primitive_desc_t desc = default;
-        desc.kind = kind;
-
-        ulong id = ecs_primitive_init(Handle, &desc);
-        Ecs.Assert(id != 0, nameof(ECS_INVALID_OPERATION));
-
-        return Entity(id);
-    }
-
-    /// <summary>
-    ///     Creates array type.
-    /// </summary>
-    /// <param name="elemId"></param>
-    /// <param name="arrayCount"></param>
-    /// <returns></returns>
-    public Entity Array(ulong elemId, int arrayCount)
-    {
-        ecs_array_desc_t desc = default;
-        desc.type = elemId;
-        desc.count = arrayCount;
-
-        ulong id = ecs_array_init(Handle, &desc);
-        Ecs.Assert(id != 0, nameof(ECS_INVALID_OPERATION));
-
-        return Entity(id);
-    }
-
-    /// <summary>
-    ///     Creates array type.
-    /// </summary>
-    /// <param name="arrayCount"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Array<T>(int arrayCount)
-    {
-        return Array(Type<T>.Id(Handle), arrayCount);
-    }
-
-    /// <summary>
-    ///     Create vector type.
-    /// </summary>
-    /// <param name="elemId"></param>
-    /// <returns></returns>
-    public Entity Vector(ulong elemId)
-    {
-        ecs_vector_desc_t desc = default;
-        desc.type = elemId;
-        ulong id = ecs_vector_init(Handle, &desc);
-        Ecs.Assert(id != 0, nameof(ECS_INVALID_OPERATION));
-        return Entity(id);
-    }
-
-    /// <summary>
-    ///     Create vector type.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public Entity Vector<T>()
-    {
-        return Vector(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Serialize untyped value to JSON.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public string ToJson(ulong id, void* value)
-    {
-        return NativeString.GetStringAndFree(ecs_ptr_to_json(Handle, id, value));
-    }
-
-    /// <summary>
-    ///     Serialize value to JSON.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    // TODO: Support managed types with ToJson and FromJson.
-    public string ToJson<T>(T* value) where T : unmanaged
-    {
-        return ToJson(Type<T>.Id(Handle), value);
-    }
-
-    /// <summary>
-    ///     Serialize value to JSON.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public string ToJson<T>(ref T value) where T : unmanaged
-    {
-        fixed (T* ptr = &value)
-        {
-            return ToJson(ptr);
-        }
-    }
-
-    /// <summary>
-    ///     Serializes the world to a JSON string using the provided description.
-    /// </summary>
-    /// <param name="desc">The description settings for JSON serialization.</param>
-    /// <returns>A JSON string with the serialized world data, or an empty string if failed.</returns>
-    public string ToJson(in WorldToJsonDesc desc)
-    {
-        fixed (ecs_world_to_json_desc_t* ptr = &desc.Desc)
-            return NativeString.GetStringAndFree(ecs_world_to_json(Handle, ptr));
-    }
-
-    /// <summary>
-    ///     Serializes the world to a JSON string.
-    /// </summary>
-    /// <returns>A JSON string with the serialized world data, or an empty string if failed.</returns>
-    public string ToJson()
-    {
-        return NativeString.GetStringAndFree(ecs_world_to_json(Handle, null));
-    }
-
-    /// <summary>
-    ///     Deserialize value from JSON.
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="value"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <returns></returns>
-    public bool FromJson(ulong id, void* value, string json, ecs_from_json_desc_t* desc = null)
-    {
-        using NativeString nativeJson = (NativeString)json;
-        return ecs_ptr_from_json(Handle, id, value, nativeJson, desc) != null;
-    }
-
-    /// <summary>
-    ///     Deserialize value from JSON.
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public bool FromJson<T>(T* value, string json, ecs_from_json_desc_t* desc = null) where T : unmanaged
-    {
-        return FromJson(Type<T>.Id(Handle), value, json, desc);
-    }
-
-    /// <summary>
-    ///     Deserialize value from JSON.
-    /// </summary>
-    /// <param name="json"></param>
-    /// <param name="desc"></param>
-    /// <returns></returns>
-    public bool FromJson(string json, ecs_from_json_desc_t* desc)
-    {
-        using NativeString nativeJson = (NativeString)json;
-        return ecs_world_from_json(Handle, nativeJson, desc) != null;
-    }
-
-    /// <summary>
-    ///     Deserialize value from JSON.
-    /// </summary>
-    /// <param name="json"></param>
-    /// <returns></returns>
-    public bool FromJson(string json)
-    {
-        using NativeString nativeJson = (NativeString)json;
-        return FromJson(json, null);
-    }
-
-    /// <summary>
-    ///     Deserialize JSON file into world.
-    /// </summary>
-    /// <param name="file"></param>
-    /// <param name="desc"></param>
-    /// <returns></returns>
-    public bool FromJsonFile(string file, ecs_from_json_desc_t *desc)
-    {
-        using NativeString nativeFile = (NativeString)file;
-        return ecs_world_from_json_file(Handle, nativeFile, desc) != null;
-    }
-
-    /// <summary>
-    ///     Deserialize JSON file into world.
-    /// </summary>
-    /// <param name="file"></param>
-    /// <returns></returns>
-    public bool FromJsonFile(string file)
-    {
-        return FromJsonFile(file, null);
-    }
-
-    /// <summary>
-    ///     Creates an app builder.
-    /// </summary>
-    /// <returns></returns>
-    public AppBuilder App()
-    {
-        return new AppBuilder(Handle);
-    }
-
-    /// <summary>
-    ///     Create metric builder.
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public MetricBuilder Metric(ulong entity)
-    {
-        return new MetricBuilder(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Creates an alert builder.
-    /// </summary>
-    /// <returns>An alert builder.</returns>
-    public AlertBuilder AlertBuilder()
-    {
-        return new AlertBuilder(Handle);
-    }
-
-    /// <summary>
-    ///     Creates an alert builder.
-    /// </summary>
-    /// <param name="name">The alert name.</param>
-    /// <returns>An alert builder.</returns>
-    public AlertBuilder AlertBuilder(string name)
-    {
-        return new AlertBuilder(Handle, name);
-    }
-
-    /// <summary>
-    ///     Creates an alert builder.
-    /// </summary>
-    /// <param name="entity">The alert entity.</param>
-    /// <returns>An alert builder.</returns>
-    public AlertBuilder AlertBuilder(ulong entity)
-    {
-        return new AlertBuilder(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Creates an alert.
-    /// </summary>
-    /// <returns>An alert.</returns>
-    public Alert Alert()
-    {
-        return AlertBuilder().Build();
-    }
-
-    /// <summary>
-    ///     Creates an alert.
-    /// </summary>
-    /// <param name="name">The alert name.</param>
-    /// <returns>An alert.</returns>
-    public Alert Alert(string name)
-    {
-        return AlertBuilder(name).Build();
-    }
-
-    /// <summary>
-    ///     Creates an alert.
-    /// </summary>
-    /// <param name="entity">The alert entity.</param>
-    /// <returns>An alert.</returns>
-    public Alert Alert(ulong entity)
-    {
-        return AlertBuilder(entity).Build();
-    }
-
-    /// <summary>
-    ///     Creates a query builder.
-    /// </summary>
-    /// <returns>A query builder.</returns>
-    public QueryBuilder QueryBuilder()
-    {
-        return new QueryBuilder(Handle);
-    }
-
-    /// <summary>
-    ///     Creates a query builder.
-    /// </summary>
-    /// <param name="name">The query name.</param>
-    /// <returns>A query builder.</returns>
-    public QueryBuilder QueryBuilder(string name)
-    {
-        return new QueryBuilder(Handle, name);
-    }
-
-    /// <summary>
-    ///     Creates a query builder.
-    /// </summary>
-    /// <param name="entity">The query entity.</param>
-    /// <returns>A query builder.</returns>
-    public QueryBuilder QueryBuilder(ulong entity)
-    {
-        return new QueryBuilder(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Creates a query.
-    /// </summary>
-    /// <returns>A query.</returns>
-    public Query Query()
-    {
-        return QueryBuilder().Build();
-    }
-
-    /// <summary>
-    ///     Creates a query.
-    /// </summary>
-    /// <param name="name">The query name.</param>
-    /// <returns>A query.</returns>
-    public Query Query(string name)
-    {
-        return new Query(Handle, Lookup(name));
-    }
-
-    /// <summary>
-    ///     Creates a query.
-    /// </summary>
-    /// <param name="entity">The query entity.</param>
-    /// <returns>A query.</returns>
-    public Query Query(ulong entity)
-    {
-        return new Query(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Creates a pipeline builder.
-    /// </summary>
-    /// <returns>A pipeline builder.</returns>
-    public PipelineBuilder Pipeline()
-    {
-        return new PipelineBuilder(Handle);
-    }
-
-    /// <summary>
-    ///     Creates a pipeline builder.
-    /// </summary>
-    /// <param name="name">The pipeline name.</param>
-    /// <returns>A pipeline builder.</returns>
-    public PipelineBuilder Pipeline(string name)
-    {
-        return new PipelineBuilder(Handle, name);
-    }
-
-    /// <summary>
-    ///     Creates a pipeline builder.
-    /// </summary>
-    /// <param name="entity">The pipeline entity.</param>
-    /// <returns>A pipeline builder.</returns>
-    public PipelineBuilder Pipeline(ulong entity)
-    {
-        return new PipelineBuilder(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Creates a pipeline builder associated with the provided type.
-    /// </summary>
-    /// <returns>A pipeline builder.</returns>
-    public PipelineBuilder Pipeline<T>()
-    {
-        return Pipeline(Type<T>.Id(Handle));
-    }
-
-    /// <summary>
-    ///     Creates an observer builder.
-    /// </summary>
-    /// <returns>An observer builder.</returns>
-    public ObserverBuilder Observer()
-    {
-        return new ObserverBuilder(Handle);
-    }
-
-    /// <summary>
-    ///     Creates an observer builder.
-    /// </summary>
-    /// <param name="name">The observer name.</param>
-    /// <returns>An observer builder.</returns>
-    public ObserverBuilder Observer(string name)
-    {
-        return new ObserverBuilder(Handle, name);
-    }
-
-    /// <summary>
-    ///     Creates an observer.
-    /// </summary>
-    /// <param name="entity">The observer entity.</param>
-    /// <returns>An observer.</returns>
-    public Observer Observer(ulong entity)
-    {
-        return new Observer(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Creates a system builder.
-    /// </summary>
-    /// <returns>A system builder.</returns>
-    public SystemBuilder System()
-    {
-        return new SystemBuilder(Handle);
-    }
-
-    /// <summary>
-    ///     Creates a system builder.
-    /// </summary>
-    /// <param name="name">The system name.</param>
-    /// <returns>A system builder.</returns>
-    public SystemBuilder System(string name)
-    {
-        return new SystemBuilder(Handle, name);
-    }
-
-    /// <summary>
-    ///     Create a system.
-    /// </summary>
-    /// <param name="entity">The system entity.</param>
-    /// <returns>A system.</returns>
-    public System_ System(ulong entity)
-    {
-        return new System_(Handle, entity);
-    }
-
-    /// <summary>
-    ///     Initializes built-in components.
-    /// </summary>
-    public void InitBuiltinComponents()
-    {
-        Import<Ecs.Meta>();
-    }
-
-    internal WorldContext* GetBindingContext()
-    {
-        return (WorldContext*)ecs_get_binding_ctx_fast(Handle);
-    }
-
-    private WorldContext* EnsureBindingContext()
-    {
-        WorldContext* ptr = (WorldContext*)ecs_get_binding_ctx_fast(Handle);
-
-        if (ptr != null)
-            return ptr;
-
-        ptr = Memory.AllocZeroed<WorldContext>(1);
-        ecs_set_binding_ctx(Handle, ptr, &Functions.WorldContextFree);
-        return ptr;
-    }
-
-    private PostFrameContext* AllocatePostFrameContext()
-    {
-        PostFrameContext* context = Memory.Alloc<PostFrameContext>(1);
-        WorldContext.RunPostFrameContexts.Add((nint)context);
-        return context;
-    }
-
-    private WorldFinishContext* AllocateWorldFinishContext()
-    {
-        WorldFinishContext* context = Memory.Alloc<WorldFinishContext>(1);
-        WorldContext.WorldFinishContexts.Add((nint)context);
-        return context;
-    }
-
-    /// <summary>
-    ///     Returns native pointer to world.
-    /// </summary>
-    /// <param name="world"></param>
-    /// <returns></returns>
-    public static ecs_world_t* To(World world)
-    {
-        return world.Handle;
-    }
-
-    /// <summary>
-    ///     Returns world wrapper for native world pointer.
-    /// </summary>
-    /// <param name="world"></param>
-    /// <returns></returns>
-    public static World From(ecs_world_t* world)
-    {
-        return new World(world);
-    }
-
-    /// <summary>
-    ///     Returns native pointer to world.
-    /// </summary>
-    /// <param name="world"></param>
-    /// <returns></returns>
-    public static implicit operator ecs_world_t*(World world)
-    {
-        return To(world);
-    }
-
-    /// <summary>
-    ///     Returns world wrapper for native world pointer.
-    /// </summary>
-    /// <param name="world"></param>
-    /// <returns></returns>
-    public static implicit operator World(ecs_world_t* world)
-    {
-        return From(world);
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="World"/> instances are equal.
-    /// </summary>
-    /// <param name="other"></param>
-    /// <returns></returns>
-    public bool Equals(World other)
-    {
-        return Handle == other.Handle;
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="World"/> instances are equal.
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    public override bool Equals(object? obj)
-    {
-        return obj is World world && Equals(world);
-    }
-
-    /// <summary>
-    ///     Returns the hash code of the <see cref="World"/>.
-    /// </summary>
-    /// <returns></returns>
-    public override int GetHashCode()
-    {
-        return Handle->GetHashCode();
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="World"/> instances are equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator ==(World left, World right)
-    {
-        return left.Equals(right);
-    }
-
-    /// <summary>
-    ///     Checks if two <see cref="World"/> instances are not equal.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator !=(World left, World right)
-    {
-        return !(left == right);
-    }
-}
-
-// Flecs.NET Extensions
-public unsafe partial struct World
-{
-    /// <summary>
-    ///     Gets an empty table.
-    /// </summary>
-    /// <returns></returns>
-    public Table Table()
-    {
-        return new Table(Handle);
-    }
-
-    /// <summary>
-    ///     Create new entity in table.
-    /// </summary>
-    /// <param name="table">The table to which to add the new entity.</param>
-    /// <returns>The new entity.</returns>
-    public Entity Entity(Table table)
-    {
-        return Entity(ecs_new_w_table(Handle, table));
-    }
-
-    /// <summary>
-    ///     Set current with id.
-    /// </summary>
-    /// <param name="with">The id.</param>
-    /// <returns>The previous id.</returns>
-    public Entity SetWith(ulong with)
-    {
-        return new Entity(Handle, ecs_set_with(Handle, with));
-    }
-
-    /// <summary>
-    ///     Get current with id.
-    /// </summary>
-    /// <returns>The last id provided to ecs_set_with().</returns>
-    public Entity GetWith()
-    {
-        return new Entity(Handle, ecs_get_with(Handle));
-    }
-
-    /// <summary>
-    ///     All entities created in function are created in scope. All operations
-    ///     called in function (such as lookup) are relative to scope.
-    /// </summary>
-    /// <param name="parent">The entity to use as scope.</param>
-    /// <param name="callback">The callback.</param>
-    public void Scope(ulong parent, Ecs.WorldCallback callback)
-    {
-        ulong prev = ecs_set_scope(Handle, parent);
-        callback(Handle);
-        ecs_set_scope(Handle, prev);
-    }
-
-    /// <summary>
-    ///     Same as Scope(parent, func), but with T as parent.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The entity to use as scope.</typeparam>
-    public void Scope<T>(Ecs.WorldCallback callback)
-    {
-        Scope(Type<T>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     Same as Scope(parent, func), but with enum as parent.
-    /// </summary>
-    /// <param name="value">The entity to use as scope.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The enum.</typeparam>
-    public void Scope<T>(T value, Ecs.WorldCallback callback) where T : Enum
-    {
-        Scope(Type<T>.Id(Handle, value), callback);
-    }
-
-    /// <summary>
-    ///     Defer all operations called in function. If the world is already in
-    ///     deferred mode, do nothing.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    public void Defer(Ecs.WorldCallback callback)
-    {
-        ecs_defer_begin(Handle);
-        callback(Handle);
-        ecs_defer_end(Handle);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with id.
-    /// </summary>
-    /// <param name="id">Id to be added to the created entities.</param>
-    /// <param name="callback">The callback.</param>
-    public void With(ulong id, Ecs.WorldCallback callback)
-    {
-        ulong prev = ecs_set_with(Handle, id);
-        callback(Handle);
-        ecs_set_with(Handle, prev);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="first">The first id.</param>
-    /// <param name="second">The second id.</param>
-    /// <param name="callback">The callback.</param>
-    public void With(ulong first, ulong second, Ecs.WorldCallback callback)
-    {
-        With(Ecs.Pair(first, second), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with type.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The component.</typeparam>
-    public void With<T>(Ecs.WorldCallback callback)
-    {
-        With(Type<T>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with enum.
-    /// </summary>
-    /// <param name="value">The enum constant.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="T">The enum.</typeparam>
-    public void With<T>(T value, Ecs.WorldCallback callback) where T : Enum
-    {
-        With<T>(Type<T>.Id(Handle, value), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="second">The second id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first component.</typeparam>
-    public void With<TFirst>(ulong second, Ecs.WorldCallback callback)
-    {
-        With(Ecs.Pair<TFirst>(second, Handle), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first component.</typeparam>
-    /// <typeparam name="TSecond">The second component.</typeparam>
-    public void With<TFirst, TSecond>(Ecs.WorldCallback callback)
-    {
-        With(Ecs.Pair<TFirst, TSecond>(Handle), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="second">The second enum constant id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first component.</typeparam>
-    /// <typeparam name="TSecond">The second enum.</typeparam>
-    public void With<TFirst, TSecond>(TSecond second, Ecs.WorldCallback callback) where TSecond : Enum
-    {
-        With<TFirst>(Type<TSecond>.Id(Handle, second), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="first">The first enum constant.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TFirst">The first enum.</typeparam>
-    /// <typeparam name="TSecond">The second component.</typeparam>
-    public void With<TFirst, TSecond>(TFirst first, Ecs.WorldCallback callback) where TFirst : Enum
-    {
-        WithSecond<TSecond>(Type<TFirst>.Id(Handle, first), callback);
-    }
-
-    /// <summary>
-    ///     All entities created in function are created with pair.
-    /// </summary>
-    /// <param name="first">The first id.</param>
-    /// <param name="callback">The callback.</param>
-    /// <typeparam name="TSecond">The second component.</typeparam>
-    public void WithSecond<TSecond>(ulong first, Ecs.WorldCallback callback)
-    {
-        With(first, Type<TSecond>.Id(Handle), callback);
-    }
-
-    /// <summary>
-    ///     Lookup entity by name.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <returns>The entity if found, else 0.</returns>
-    public Entity Lookup(string path)
-    {
-        return Lookup(path, true);
-    }
-
-    /// <summary>
-    ///     Lookup entity by name.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <returns>The entity if found, else 0.</returns>
-    public Entity Lookup(string path, bool recursive)
-    {
-        if (string.IsNullOrEmpty(path))
-            return new Entity(Handle, 0);
-
-        using NativeString nativePath = (NativeString)path;
-
-        return new Entity(
-            Handle,
-            ecs_lookup_path_w_sep(Handle, 0, nativePath,
-                Pointers.DefaultSeparator, Pointers.DefaultSeparator, recursive)
-        );
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, out Entity entity)
-    {
-        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, true, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, bool recursive, out Entity entity)
-    {
-        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, recursive, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="separator">The separator.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, string separator, out Entity entity)
-    {
-        return TryLookup(path, separator, Ecs.DefaultSeparator, true, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="separator">The separator.</param>
-    /// <param name="rootSeparator">The root separator.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, string separator, string rootSeparator, out Entity entity)
-    {
-        return TryLookup(path, separator, rootSeparator, true, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="separator">The separator.</param>
-    /// <param name="rootSeparator">The root separator.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, string separator, string rootSeparator, bool recursive, out Entity entity)
-    {
-        return (entity = Lookup(path, separator, rootSeparator, recursive)) != 0;
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, out ulong entity)
-    {
-        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, true, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, bool recursive, out ulong entity)
-    {
-        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, recursive, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="separator">The separator.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, string separator, out ulong entity)
-    {
-        return TryLookup(path, separator, Ecs.DefaultSeparator, true, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="separator">The separator.</param>
-    /// <param name="rootSeparator">The root separator.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, string separator, string rootSeparator, out ulong entity)
-    {
-        return TryLookup(path, separator, rootSeparator, true, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity from a path.
-    /// </summary>
-    /// <param name="path">The path to resolve.</param>
-    /// <param name="separator">The separator.</param>
-    /// <param name="rootSeparator">The root separator.</param>
-    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookup(string path, string separator, string rootSeparator, bool recursive, out ulong entity)
-    {
-        return (entity = Lookup(path, separator, rootSeparator, recursive)) != 0;
-    }
-
-    /// <summary>
-    ///     Lookup an entity by its symbol name.
-    /// </summary>
-    /// <param name="symbol">The symbol.</param>
-    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
-    /// <param name="recursive">If looking up as path, recursively traverse up the tree.</param>
-    /// <returns>The entity if found, else 0.</returns>
-    public Entity LookupSymbol(string symbol, bool lookupAsPath = false, bool recursive = false)
-    {
-        if (string.IsNullOrEmpty(symbol))
-            return new Entity(Handle, 0);
-
-        using NativeString nativeSymbol = (NativeString)symbol;
-
-        return new Entity(
-            Handle,
-            ecs_lookup_symbol(Handle, nativeSymbol, lookupAsPath, recursive)
-        );
-    }
-
-    /// <summary>
-    ///     Lookup an entity by its symbol name.
-    /// </summary>
-    /// <param name="symbol">The symbol.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookupSymbol(string symbol, out Entity entity)
-    {
-        return TryLookupSymbol(symbol, false, false, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity by its symbol name.
-    /// </summary>
-    /// <param name="symbol">The symbol.</param>
-    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookupSymbol(string symbol, bool lookupAsPath, out Entity entity)
-    {
-        return TryLookupSymbol(symbol, lookupAsPath, false, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity by its symbol name.
-    /// </summary>
-    /// <param name="symbol">The symbol.</param>
-    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
-    /// <param name="recursive">If looking up as path, recursively traverse up the tree.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookupSymbol(string symbol, bool lookupAsPath, bool recursive, out Entity entity)
-    {
-        return (entity = LookupSymbol(symbol, lookupAsPath, recursive)) != 0;
-    }
-
-    /// <summary>
-    ///     Lookup an entity by its symbol name.
-    /// </summary>
-    /// <param name="symbol">The symbol.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookupSymbol(string symbol, out ulong entity)
-    {
-        return TryLookupSymbol(symbol, false, false, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity by its symbol name.
-    /// </summary>
-    /// <param name="symbol">The symbol.</param>
-    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookupSymbol(string symbol, bool lookupAsPath, out ulong entity)
-    {
-        return TryLookupSymbol(symbol, lookupAsPath, false, out entity);
-    }
-
-    /// <summary>
-    ///     Lookup an entity by its symbol name.
-    /// </summary>
-    /// <param name="symbol">The symbol.</param>
-    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
-    /// <param name="recursive">If looking up as path, recursively traverse up the tree.</param>
-    /// <param name="entity">The entity if found, else 0.</param>
-    /// <returns>True if the entity was found, else false.</returns>
-    public bool TryLookupSymbol(string symbol, bool lookupAsPath, bool recursive, out ulong entity)
-    {
-        return (entity = LookupSymbol(symbol, lookupAsPath, recursive)) != 0;
-    }
-
-    /// <summary>
-    ///     Cleanup empty tables.
-    /// </summary>
-    /// <param name="desc">The description object.</param>
-    /// <returns>The number of deleted tables.</returns>
-    public int DeleteEmptyTables(in DeleteEmptyTablesDesc desc)
-    {
-        fixed (ecs_delete_empty_tables_desc_t* ptr = &desc.Desc)
-            return ecs_delete_empty_tables(Handle, ptr);
-    }
-}
+using Flecs.NET.Core.BindingContext;
+using Flecs.NET.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+/// <summary>
+///     The world is the container of all ECS data and systems. If the world is deleted, all data in the world will be
+///     deleted as well.
+/// </summary>
+public readonly unsafe partial struct World : IDisposable, IEquatable<World>
+{
+    private readonly ecs_world_t* _handle;
+
+    internal ref WorldContext WorldContext => ref *EnsureBindingContext();
+
+    /// <summary>
+    ///     The handle to the C world.
+    /// </summary>
+    public ref readonly ecs_world_t* Handle => ref _handle;
+
+    /// <summary>
+    ///     Constructs a world from an <see cref="ecs_world_t"/> pointer.
+    /// </summary>
+    /// <param name="handle">The world handle.</param>
+    public World(ecs_world_t* handle)
+    {
+        _handle = handle;
+    }
+
+    /// <summary>
+    ///     Creates a flecs world that is owned.
+    /// </summary>
+    /// <returns></returns>
+    public static World Create()
+    {
+        Ecs.Os.OverrideOsApi();
+
+        World w = new World(ecs_init());
+        w.EnsureBindingContext();
+        w.InitBuiltinComponents();
+
+        return w;
+    }
+
+    /// <summary>
+    ///     Creates a flecs world from an <see cref="ecs_world_t"/> pointer that is not owned.
+    /// </summary>
+    /// <param name="world">A C world.</param>
+    /// <returns>A newly created world.</returns>
+    public static World Create(ecs_world_t* world)
+    {
+        Ecs.Os.OverrideOsApi();
+
+        World w = new World(world);
+        w.EnsureBindingContext();
+        w.InitBuiltinComponents();
+
+        return w;
+    }
+
+    /// <summary>
+    ///     Creates world from command line arguments.
+    /// </summary>
+    /// <param name="args">Command line arguments.</param>
+    /// <returns></returns>
+    public static World Create(params Span<string> args)
+    {
+        NativeString* nativeStrings = Memory.AllocZeroed<NativeString>(args.Length);
+
+        for (int i = 0; i < args.Length; i++)
+            nativeStrings[i] = (NativeString)args[i];
+
+        Ecs.Os.OverrideOsApi();
+
+        World w = new World(ecs_init_w_args(args.Length, (byte**)nativeStrings));
+        w.EnsureBindingContext();
+        w.InitBuiltinComponents();
+
+        for (int i = 0; i < args.Length; i++)
+            nativeStrings[i].Dispose();
+
+        Memory.Free(nativeStrings);
+
+        return w;
+    }
+
+    /// <summary>
+    ///     Calls <see cref="ecs_fini"/> and cleans up resources.
+    /// </summary>
+    public void Dispose()
+    {
+        if (Handle == null || !Ecs.IsStageOrWorld(Handle))
+            return;
+
+        _ = ecs_fini(Handle);
+    }
+
+    public void Shrink()
+    {
+        ecs_shrink(Handle);
+    }
+    public void ExclusiveAccessBegin(string threadName)
+    {
+        using NativeString nativeThreadName = (NativeString) threadName;
+        ecs_exclusive_access_begin(Handle, nativeThreadName);
+    }
+    public void ExclusiveAccessEnd(bool lockWorld)
+    {
+        ecs_exclusive_access_end(Handle, lockWorld);
+    }
+
+    /// <summary>
+    ///     Signals that the application should quit. The next call to <see cref="Progress"/> returns false.
+    /// </summary>
+    public void Quit()
+    {
+        ecs_quit(Handle);
+    }
+
+    /// <summary>
+    ///     Register action to be executed when world is destroyed.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    public void AtFini(Ecs.WorldFinishCallback callback)
+    {
+        WorldFinishContext* context = AllocateWorldFinishContext();
+        context->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.WorldFinishCallbackDelegate);
+        ecs_atfini(Handle, &Functions.WorldFinishCallback, context);
+    }
+
+    /// <summary>
+    ///     Register action to be executed when world is destroyed.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    public void AtFini(delegate*<World, void> callback)
+    {
+        WorldFinishContext* context = AllocateWorldFinishContext();
+        context->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.WorldFinishCallbackPointer);
+        ecs_atfini(Handle, &Functions.WorldFinishCallback, context);
+    }
+
+    /// <summary>
+    ///     Test if Quit() has been called.
+    /// </summary>
+    /// <returns></returns>
+    public bool ShouldQuit()
+    {
+        return ecs_should_quit(Handle);
+    }
+
+    /// <summary>
+    ///     Begin frame.
+    /// </summary>
+    /// <param name="deltaTime"></param>
+    /// <returns></returns>
+    public float FrameBegin(float deltaTime = 0)
+    {
+        return ecs_frame_begin(Handle, deltaTime);
+    }
+
+    /// <summary>
+    ///     End frame.
+    /// </summary>
+    public void FrameEnd()
+    {
+        ecs_frame_end(Handle);
+    }
+
+    /// <summary>
+    ///     Begin staging.
+    /// </summary>
+    /// <returns></returns>
+    public bool ReadonlyBegin(bool multiThreaded = false)
+    {
+        return ecs_readonly_begin(Handle, multiThreaded);
+    }
+
+    /// <summary>
+    ///     End staging.
+    /// </summary>
+    public void ReadonlyEnd()
+    {
+        ecs_readonly_end(Handle);
+    }
+
+    /// <summary>
+    ///     Defer operations until end end of frame, or until DeferEnd() is called.
+    /// </summary>
+    /// <returns></returns>
+    public bool DeferBegin()
+    {
+        return ecs_defer_begin(Handle);
+    }
+
+    /// <summary>
+    ///     End block of operations to defer.
+    /// </summary>
+    /// <returns></returns>
+    public bool DeferEnd()
+    {
+        return ecs_defer_end(Handle);
+    }
+
+    /// <summary>
+    ///     Test whether deferring is enabled.
+    /// </summary>
+    /// <returns></returns>
+    public bool IsDeferred()
+    {
+        return ecs_is_deferred(Handle);
+    }
+
+    /// <summary>
+    ///     Configure world to have N stages.
+    /// </summary>
+    /// <param name="stages"></param>
+    public void SetStageCount(int stages)
+    {
+        ecs_set_stage_count(Handle, stages);
+    }
+
+    /// <summary>
+    ///     Get number of configured stages.
+    /// </summary>
+    /// <returns></returns>
+    public int GetStageCount()
+    {
+        return ecs_get_stage_count(Handle);
+    }
+
+    /// <summary>
+    ///     Get current stage id.
+    /// </summary>
+    /// <returns></returns>
+    public int GetStageId()
+    {
+        return ecs_stage_get_id(Handle);
+    }
+
+    /// <summary>
+    ///     Test if is a stage.
+    /// </summary>
+    /// <returns></returns>
+    public bool IsStage()
+    {
+        Ecs.Assert(
+            flecs_poly_is_(Handle, ecs_world_t_magic) ||
+            flecs_poly_is_(Handle, ecs_stage_t_magic),
+            nameof(ECS_INVALID_PARAMETER)
+        );
+        return flecs_poly_is_(Handle, ecs_stage_t_magic);
+    }
+
+    /// <summary>
+    ///     Merge world or stage.
+    /// </summary>
+    public void Merge()
+    {
+        ecs_merge(Handle);
+    }
+
+    /// <summary>
+    ///     Get stage-specific world pointer.
+    /// </summary>
+    /// <param name="stageId"></param>
+    /// <returns></returns>
+    public World GetStage(int stageId)
+    {
+        return new World(ecs_get_stage(Handle, stageId));
+    }
+
+    /// <summary>
+    ///     Creates asynchronous stage.
+    /// </summary>
+    /// <returns></returns>
+    public World AsyncStage()
+    {
+        return new World(ecs_stage_new(Handle));
+    }
+
+    /// <summary>
+    ///     Get actual world.
+    /// </summary>
+    /// <returns></returns>
+    public World GetWorld()
+    {
+        return new World(Handle == null ? null : ecs_get_world(Handle));
+    }
+
+    /// <summary>
+    ///     Test whether the current world object is readonly.
+    /// </summary>
+    /// <returns></returns>
+    public bool IsReadOnly()
+    {
+        return ecs_stage_is_readonly(Handle);
+    }
+
+    /// <summary>
+    ///     Sets the user context object for the world.
+    /// </summary>
+    /// <param name="value">The user context object.</param>
+    /// <typeparam name="T">The user context type.</typeparam>
+    public void SetCtx<T>(T value)
+    {
+        WorldContext.UserContext.Set(ref value);
+    }
+
+    /// <summary>
+    ///     Sets the user context object for the world. The provided callback will be run before the
+    ///     user context object is released by flecs.
+    /// </summary>
+    /// <param name="value">The user context object.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The user context type.</typeparam>
+    public void SetCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        WorldContext.UserContext.Set(ref value, callback);
+    }
+
+    /// <summary>
+    ///     Sets the user context object for the world. The provided callback will be run before the
+    ///     user context object is released by flecs.
+    /// </summary>
+    /// <param name="value">The user context object.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The user context type.</typeparam>
+    public void SetCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        WorldContext.UserContext.Set(ref value, callback);
+    }
+
+    /// <summary>
+    ///     Gets the user context object for the world.
+    /// </summary>
+    /// <typeparam name="T">The user context type.</typeparam>
+    /// <returns></returns>
+    public ref T GetCtx<T>()
+    {
+        return ref WorldContext.UserContext.Get<T>();
+    }
+
+    /// <summary>
+    ///     Preallocate memory for number of entities.
+    /// </summary>
+    /// <param name="entityCount"></param>
+    public void Dim(int entityCount)
+    {
+        ecs_dim(Handle, entityCount);
+    }
+
+    /// <summary>
+    ///     Set entity range.
+    /// </summary>
+    /// <param name="min"></param>
+    /// <param name="max"></param>
+    public void SetEntityRange(ulong min, ulong max)
+    {
+        ecs_set_entity_range(Handle, min, max);
+    }
+
+    /// <summary>
+    ///     Enforce that operations cannot modify entities outside of range.
+    /// </summary>
+    /// <param name="enabled"></param>
+    public void EnableRangeCheck(bool enabled = true)
+    {
+        ecs_enable_range_check(Handle, enabled);
+    }
+
+    /// <summary>
+    ///     Set the current scope.
+    /// </summary>
+    /// <param name="scope">The entity to use as scope.</param>
+    /// <returns>The previous scope.</returns>
+    public Entity SetScope(ulong scope)
+    {
+        return new Entity(Handle, ecs_set_scope(Handle, scope));
+    }
+
+    /// <summary>
+    ///     Set the current scope.
+    /// </summary>
+    /// <typeparam name="T">The entity to use as scope.</typeparam>
+    /// <returns>The previous scope.</returns>
+    public Entity SetScope<T>()
+    {
+        return SetScope(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Set the current scope.
+    /// </summary>
+    /// <param name="value">The entity to use as scope.</param>
+    /// <typeparam name="T">The enum.</typeparam>
+    /// <returns>The previous scope.</returns>
+    public Entity SetScope<T>(T value) where T : Enum
+    {
+        return SetScope(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Get the current scope.
+    /// </summary>
+    /// <returns>The current scope.</returns>
+    public Entity GetScope()
+    {
+        return new Entity(Handle, ecs_get_scope(Handle));
+    }
+
+    /// <summary>
+    ///     Set search path.
+    /// </summary>
+    /// <param name="searchPath"></param>
+    /// <returns></returns>
+    public ulong* SetLookupPath(ulong* searchPath)
+    {
+        return ecs_set_lookup_path(Handle, searchPath);
+    }
+
+    /// <summary>
+    ///     Lookup entity by name.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="separator">The separator.</param>
+    /// <param name="rootSeparator">The root separator.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <returns>The entity if found, else 0.</returns>
+    public Entity Lookup(
+        string path,
+        string separator = Ecs.DefaultSeparator,
+        string rootSeparator = Ecs.DefaultSeparator,
+        bool recursive = true)
+    {
+        if (string.IsNullOrEmpty(path))
+            return new Entity(Handle, 0);
+
+        using NativeString nativePath = (NativeString)path;
+        using NativeString nativeSeparator = (NativeString)separator;
+        using NativeString nativeRootSeparator = (NativeString)rootSeparator;
+
+        return new Entity(
+            Handle,
+            ecs_lookup_path_w_sep(Handle, 0, nativePath, nativeSeparator, nativeRootSeparator, recursive)
+        );
+    }
+
+    /// <summary>
+    ///     Sets the data of a component.
+    /// </summary>
+    /// <param name="id">The id of the component to set.</param>
+    /// <param name="size">The size of the pointed-to data.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <returns>Reference to self.</returns>
+    public World SetUntyped(ulong id, int size, void* data)
+    {
+        Entity(id).SetUntyped(id, size, data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a component.
+    /// </summary>
+    /// <param name="id">The id of the component to set.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <returns>Reference to self.</returns>
+    public World SetUntyped(ulong id, void* data)
+    {
+        Entity(id).SetUntyped(id, data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a pair component.
+    /// </summary>
+    /// <param name="first">The first id of the pair.</param>
+    /// <param name="second">The second id of the pair.</param>
+    /// <param name="size">The size of the pointed-to data.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <returns>Reference to self.</returns>
+    public World SetUntyped(ulong first, ulong second, int size, void* data)
+    {
+        Entity(first).SetUntyped(first, second, size, data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton component.
+    /// </summary>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="T">The component type.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetPtr<T>(T* data)
+    {
+        Entity<T>().SetPtr(data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="second">The second id of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetPtr<TFirst>(ulong second, TFirst* data)
+    {
+        Entity<TFirst>().SetPtr(second, data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetPtr<TFirst, TSecond>(TFirst* data)
+    {
+        Entity<TFirst>().SetPtr<TFirst, TSecond>(data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetPtr<TFirst, TSecond>(TSecond* data)
+    {
+        Entity<TFirst>().SetPtr<TFirst, TSecond>(data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="second">The second id (enum member) of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetPtr<TFirst, TSecond>(TSecond second, TFirst* data) where TSecond : Enum
+    {
+        return SetPtr(Type<TSecond>.Id(Handle, second), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="first">The first id (enum member) of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetPtr<TFirst, TSecond>(TFirst first, TSecond* data) where TFirst : Enum
+    {
+        return SetPtrSecond(Type<TFirst>.Id(Handle, first), data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="first">The first id of the pair.</param>
+    /// <param name="data">The pointer to the data.</param>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetPtrSecond<TSecond>(ulong first, TSecond* data)
+    {
+        Entity(first).SetPtrSecond(first, data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton component.
+    /// </summary>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="T">The component type.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World Set<T>(in T data)
+    {
+        Entity<T>().Set(in data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="second">The second id of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World Set<TFirst>(ulong second, in TFirst data)
+    {
+        Entity<TFirst>().Set(second, in data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World Set<TFirst, TSecond>(in TFirst data)
+    {
+        Entity<TFirst>().Set<TFirst, TSecond>(in data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World Set<TFirst, TSecond>(in TSecond data)
+    {
+        Entity<TFirst>().Set<TFirst, TSecond>(in data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="second">The second id (enum member) of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World Set<TFirst, TSecond>(TSecond second, in TFirst data) where TSecond : Enum
+    {
+        return Set(Type<TSecond>.Id(Handle, second), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="first">The first id (enum member) of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TFirst">The first type of the pair.</typeparam>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World Set<TFirst, TSecond>(TFirst first, in TSecond data) where TFirst : Enum
+    {
+        return SetSecond(Type<TFirst>.Id(Handle, first), in data);
+    }
+
+    /// <summary>
+    ///     Sets the data of a singleton pair component.
+    /// </summary>
+    /// <param name="first">The first id of the pair.</param>
+    /// <param name="data">The component data.</param>
+    /// <typeparam name="TSecond">The second type of the pair.</typeparam>
+    /// <returns>Reference to self.</returns>
+    public World SetSecond<TSecond>(ulong first, in TSecond data)
+    {
+        Entity(first).SetSecond(first, in data);
+        return this;
+    }
+
+    /// <summary>
+    ///     Ensure singleton component inside a callback.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public void Insert<T>(Ecs.InsertRefCallback<T> callback)
+    {
+        Invoker.Insert(Handle, Type<T>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* EnsurePtr<T>() where T : unmanaged
+    {
+        return Entity<T>().EnsurePtr<T>();
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public TFirst* EnsurePtr<TFirst>(ulong second) where TFirst : unmanaged
+    {
+        return Entity<TFirst>().EnsurePtr<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* EnsurePtr<TFirst, TSecond>(TSecond second)
+        where TFirst : unmanaged
+        where TSecond : Enum
+    {
+        return EnsurePtr<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* EnsurePtr<TFirst, TSecond>(TFirst first)
+        where TFirst : Enum
+        where TSecond : unmanaged
+    {
+        return EnsureSecondPtr<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* EnsureFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
+    {
+        return Entity<TFirst>().EnsureFirstPtr<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* EnsureSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
+    {
+        return Entity<TFirst>().EnsureSecondPtr<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* EnsureSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
+    {
+        return Entity(first).EnsureSecondPtr<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref T Ensure<T>()
+    {
+        return ref Entity<T>().Ensure<T>();
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref TFirst Ensure<TFirst>(ulong second)
+    {
+        return ref Entity<TFirst>().Ensure<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst Ensure<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Ensure<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond Ensure<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref EnsureSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst EnsureFirst<TFirst, TSecond>()
+    {
+        return ref Entity<TFirst>().EnsureFirst<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond EnsureSecond<TFirst, TSecond>()
+    {
+        return ref Entity<TFirst>().EnsureSecond<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond EnsureSecond<TSecond>(ulong first)
+    {
+        return ref Entity(first).EnsureSecond<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Mark singleton component as modified.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Modified<T>()
+    {
+        Entity<T>().Modified<T>();
+    }
+
+    /// <summary>
+    ///     Mark singleton pair as modified.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Modified<TFirst>(ulong second)
+    {
+        Entity<TFirst>().Modified<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Mark singleton pair as modified.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Modified<TFirst, TSecond>()
+    {
+        Entity<TFirst>().Modified<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Mark singleton pair as modified.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Modified<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Modified<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Mark singleton pair as modified.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Modified<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        ModifiedSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Mark singleton pair as modified.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    public void ModifiedSecond<TSecond>(ulong first)
+    {
+        Entity(first).ModifiedSecond<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Gets ref to singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Ref<T> GetRef<T>()
+    {
+        return Entity<T>().GetRef<T>();
+    }
+
+    /// <summary>
+    ///     Gets ref to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public Ref<TFirst> GetRef<TFirst>(ulong second)
+    {
+        return Entity<TFirst>().GetRef<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Gets ref to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TFirst> GetRef<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return GetRef<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Gets ref to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TSecond> GetRef<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return GetRefSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Gets ref to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TFirst> GetRefFirst<TFirst, TSecond>()
+    {
+        return Entity<TFirst>().GetRefFirst<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Gets ref to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TSecond> GetRefSecond<TFirst, TSecond>()
+    {
+        return Entity<TFirst>().GetRefSecond<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Gets ref to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Ref<TSecond> GetRefSecond<TSecond>(ulong first)
+    {
+        return Entity(first).GetRefSecond<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Gets pointer to singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* GetPtr<T>() where T : unmanaged
+    {
+        return Entity<T>().GetPtr<T>();
+    }
+
+    /// <summary>
+    ///     Gets pointer to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetPtr<TFirst>(ulong second) where TFirst : unmanaged
+    {
+        return Entity<TFirst>().GetPtr<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Gets pointer to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetPtr<TFirst, TSecond>(TSecond second)
+        where TFirst : unmanaged
+        where TSecond : Enum
+    {
+        return GetPtr<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Gets pointer to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetPtr<TFirst, TSecond>(TFirst first)
+        where TFirst : Enum
+        where TSecond : unmanaged
+    {
+        return GetSecondPtr<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Gets pointer to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
+    {
+        return Entity<TFirst>().GetFirstPtr<TFirst, TSecond>();
+    }
+
+
+    /// <summary>
+    ///     Gets pointer to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
+    {
+        return Entity<TFirst>().GetSecondPtr<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Gets pointer to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
+    {
+        return Entity(first).GetSecondPtr<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Gets managed reference to singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref readonly T Get<T>()
+    {
+        return ref Entity<T>().Get<T>();
+    }
+
+    /// <summary>
+    ///     Gets managed reference to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref readonly TFirst Get<TFirst>(ulong second)
+    {
+        return ref Entity<TFirst>().Get<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Gets managed reference to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TFirst Get<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref Get<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Gets managed reference to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TSecond Get<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref GetSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Gets managed reference to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TFirst GetFirst<TFirst, TSecond>()
+    {
+        return ref Entity<TFirst>().GetFirst<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Gets managed reference to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TSecond GetSecond<TFirst, TSecond>()
+    {
+        return ref Entity<TFirst>().GetSecond<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Gets managed reference to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref readonly TSecond GetSecond<TSecond>(ulong first)
+    {
+        return ref Entity(first).GetSecond<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public T* GetMutPtr<T>() where T : unmanaged
+    {
+        return Entity<T>().GetMutPtr<T>();
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetMutPtr<TFirst>(ulong second) where TFirst : unmanaged
+    {
+        return Entity<TFirst>().GetMutPtr<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetMutPtr<TFirst, TSecond>(TSecond second)
+        where TFirst : unmanaged
+        where TSecond : Enum
+    {
+        return GetMutPtr<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetMutPtr<TFirst, TSecond>(TFirst first)
+        where TFirst : Enum
+        where TSecond : unmanaged
+    {
+        return GetMutSecondPtr<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TFirst* GetMutFirstPtr<TFirst, TSecond>() where TFirst : unmanaged
+    {
+        return Entity<TFirst>().GetMutFirstPtr<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetMutSecondPtr<TFirst, TSecond>() where TSecond : unmanaged
+    {
+        return Entity<TFirst>().GetMutSecondPtr<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get mutable pointer to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public TSecond* GetMutSecondPtr<TSecond>(ulong first) where TSecond : unmanaged
+    {
+        return Entity(first).GetMutSecondPtr<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ref T GetMut<T>()
+    {
+        return ref Entity<T>().GetMut<T>();
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public ref TFirst GetMut<TFirst>(ulong second)
+    {
+        return ref Entity<TFirst>().GetMut<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst GetMut<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return ref GetMut<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond GetMut<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return ref GetMutSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TFirst GetMutFirst<TFirst, TSecond>()
+    {
+        return ref Entity<TFirst>().GetMutFirst<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond GetMutSecond<TFirst, TSecond>()
+    {
+        return ref Entity<TFirst>().GetMutSecond<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get managed mutable reference to singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public ref TSecond GetMutSecond<TSecond>(ulong first)
+    {
+        return ref Entity(first).GetMutSecond<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Get a readonly singleton component inside a callback.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Read<T>(Ecs.ReadRefCallback<T> callback)
+    {
+        Invoker.Read(Handle, Type<T>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     Get a mutable singleton component inside a callback.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Write<T>(Ecs.WriteRefCallback<T> callback)
+    {
+        Invoker.Write(Handle, Type<T>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///      Test if world has singleton component.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public bool Has(ulong id)
+    {
+        return Entity(id).Has(id);
+    }
+
+    /// <summary>
+    ///     Test if world has singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public bool Has(ulong first, ulong second)
+    {
+        return Entity(first).Has(first, second);
+    }
+
+    /// <summary>
+    ///     Test if world has singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Has<T>()
+    {
+        return Entity<T>().Has<T>();
+    }
+
+    /// <summary>
+    ///     Test if world has singleton component.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool Has<T>(T value) where T : Enum
+    {
+        return Entity<T>().Has(value);
+    }
+
+    /// <summary>
+    ///     Test if world has singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst>(ulong second)
+    {
+        return Entity<TFirst>().Has<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Test if world has singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst, TSecond>()
+    {
+        return Entity<TFirst>().Has<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Test if world has singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Has<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Test if world has singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool Has<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return HasSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Test if world has singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public bool HasSecond<TSecond>(ulong first)
+    {
+        return Entity(first).Has(first, Type<TSecond>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Add singleton component.
+    /// </summary>
+    /// <param name="id"></param>
+    public void Add(ulong id)
+    {
+        Entity(id).Add(id);
+    }
+
+    /// <summary>
+    ///     Add singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    public void Add(ulong first, ulong second)
+    {
+        Entity(first).Add(first, second);
+    }
+
+    /// <summary>
+    ///     Add singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Add<T>()
+    {
+        Entity<T>().Add<T>();
+    }
+
+    /// <summary>
+    ///     Add singleton component.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Add<T>(T value) where T : Enum
+    {
+        Entity<T>().Add(value);
+    }
+
+    /// <summary>
+    ///     Add singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Add<TFirst>(ulong second)
+    {
+        Entity<TFirst>().Add<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Add singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Add<TFirst, TSecond>()
+    {
+        Entity<TFirst>().Add<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Add singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Add<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Add<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Add singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Add<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        AddSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Add singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    public void AddSecond<TSecond>(ulong first)
+    {
+        Entity(first).AddSecond<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Remove singleton id.
+    /// </summary>
+    /// <param name="id"></param>
+    public void Remove(ulong id)
+    {
+        Entity(id).Remove(id);
+    }
+
+    /// <summary>
+    ///     Remove singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    public void Remove(ulong first, ulong second)
+    {
+        Entity(first).Remove(first, second);
+    }
+
+    /// <summary>
+    ///     Remove singleton component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void Remove<T>()
+    {
+        Entity<T>().Remove<T>();
+    }
+
+    /// <summary>
+    ///     Remove singleton id.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Remove<T>(T value) where T : Enum
+    {
+        Entity<T>().Remove(value);
+    }
+
+    /// <summary>
+    ///     Remove singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Remove<TFirst>(ulong second)
+    {
+        Entity<TFirst>().Remove<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Remove singleton pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Remove<TFirst, TSecond>()
+    {
+        Entity<TFirst>().Remove<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Remove singleton pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Remove<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Remove<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Remove singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Remove<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        RemoveSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Remove singleton pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    public void RemoveSecond<TSecond>(ulong first)
+    {
+        Entity(first).Remove<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Iterate entities in root of world
+    /// </summary>
+    /// <param name="func"></param>
+    public void Children(Ecs.EachEntityCallback func)
+    {
+        Entity(0).Children(func);
+    }
+
+    /// <summary>
+    ///     Get singleton entity for type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Singleton<T>()
+    {
+        return Entity<T>();
+    }
+
+    /// <summary>
+    ///     Get target for a given pair from a singleton entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public Entity Target(ulong id, int index = 0)
+    {
+        return Entity(ecs_get_target(Handle, id, id, index));
+    }
+
+    /// <summary>
+    ///     Get target for a given pair from a singleton entity.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="rel"></param>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    public Entity Target(ulong id, ulong rel, int index = 0)
+    {
+        return Entity(ecs_get_target(Handle, id, rel, index));
+    }
+
+    /// <summary>
+    ///     Get target for a given pair from a singleton entity.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Target<T>(int index = 0)
+    {
+        return Entity(ecs_get_target(Handle, Type<T>.Id(Handle), Type<T>.Id(Handle), index));
+    }
+
+    /// <summary>
+    ///     Get target for a given pair from a singleton entity.
+    /// </summary>
+    /// <param name="rel"></param>
+    /// <param name="index"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Target<T>(ulong rel, int index = 0)
+    {
+        return Entity(ecs_get_target(Handle, Type<T>.Id(Handle), rel, index));
+    }
+
+    /// <summary>
+    ///     Get target for a given pair from a singleton entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="index"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Target<T>(T value, int index = 0) where T : Enum
+    {
+        return Entity(ecs_get_target(Handle, Entity(value), Entity(value), index));
+    }
+
+    /// <summary>
+    ///     Get target for a given pair from a singleton entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="rel"></param>
+    /// <param name="index"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Target<T>(T value, ulong rel, int index = 0) where T : Enum
+    {
+        return Entity(ecs_get_target(Handle, Entity(value), rel, index));
+    }
+
+    /// <summary>
+    ///     Creates alias for component.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <param name="alias"></param>
+    public Entity Use(ulong entity, string alias = "")
+    {
+        if (string.IsNullOrEmpty(alias))
+            alias = NativeString.GetString(ecs_get_name(Handle, entity));
+
+        using NativeString nativeAlias = (NativeString)alias;
+        ecs_set_alias(Handle, entity, nativeAlias);
+        return Entity(entity);
+    }
+
+    /// <summary>
+    ///     Creates alias for component.
+    /// </summary>
+    /// <param name="alias"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Use<T>(string alias = "")
+    {
+        ulong entity = Type<T>.Id(Handle);
+
+        if (string.IsNullOrEmpty(alias))
+            alias = NativeString.GetString(ecs_get_name(Handle, entity));
+
+        using NativeString nativeAlias = (NativeString)alias;
+
+        ecs_set_alias(Handle, entity, nativeAlias);
+        return Entity(entity);
+    }
+
+    /// <summary>
+    ///     Creates alias for component.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="alias"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Use<T>(T value, string alias = "") where T : Enum
+    {
+        return Use(Type<T>.Id(Handle, value), alias);
+    }
+
+    /// <summary>
+    ///     Creates alias for component.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <param name="alias"></param>
+    /// <returns></returns>
+    public Entity Use(string name, string alias = "")
+    {
+        using NativeString nativeName = (NativeString)name;
+
+        ulong entity = ecs_lookup_path_w_sep(Handle, 0, nativeName,
+            Pointers.DefaultSeparator, Pointers.DefaultSeparator, true);
+
+        Ecs.Assert(entity != 0, nameof(ECS_INVALID_PARAMETER));
+
+        using NativeString nativeAlias = (NativeString)alias;
+
+        ecs_set_alias(Handle, entity, nativeAlias);
+        return Entity(entity);
+    }
+
+    /// <summary>
+    ///     Count entities matching a component.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public int Count(ulong id)
+    {
+        return ecs_count_id(Handle, id);
+    }
+
+    /// <summary>
+    ///     Count entities matching a pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public int Count(ulong first, ulong second)
+    {
+        return Count(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Count entities matching a component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public int Count<T>()
+    {
+        return Count(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Count entities matching a component.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public int Count<T>(T value) where T : Enum
+    {
+        return Count<T>(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Count entities matching a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public int Count<TFirst>(ulong second)
+    {
+        return Count(Ecs.Pair<TFirst>(second, Handle));
+    }
+
+    /// <summary>
+    ///     Count entities matching a pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public int Count<TFirst, TSecond>()
+    {
+        return Count(Ecs.Pair<TFirst, TSecond>(Handle));
+    }
+
+    /// <summary>
+    ///     Count entities matching a pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public int Count<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Count<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Count entities matching a pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public int Count<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return CountSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Count entities matching a pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public int CountSecond<TSecond>(ulong first)
+    {
+        return Count(first, Type<TSecond>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with id.
+    /// </summary>
+    /// <param name="id">Id to be added to the created entities.</param>
+    /// <param name="callback">The callback.</param>
+    public void With(ulong id, Action callback)
+    {
+        ulong prev = ecs_set_with(Handle, id);
+        callback();
+        ecs_set_with(Handle, prev);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="first">The first id.</param>
+    /// <param name="second">The second id.</param>
+    /// <param name="callback">The callback.</param>
+    public void With(ulong first, ulong second, Action callback)
+    {
+        With(Ecs.Pair(first, second), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with type.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The component.</typeparam>
+    public void With<T>(Action callback)
+    {
+        With(Type<T>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with enum.
+    /// </summary>
+    /// <param name="value">The enum constant.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The enum.</typeparam>
+    public void With<T>(T value, Action callback) where T : Enum
+    {
+        With<T>(Type<T>.Id(Handle, value), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="second">The second id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first component.</typeparam>
+    public void With<TFirst>(ulong second, Action callback)
+    {
+        With(Ecs.Pair<TFirst>(second, Handle), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first component.</typeparam>
+    /// <typeparam name="TSecond">The second component.</typeparam>
+    public void With<TFirst, TSecond>(Action callback)
+    {
+        With(Ecs.Pair<TFirst, TSecond>(Handle), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="second">The second enum constant id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first component.</typeparam>
+    /// <typeparam name="TSecond">The second enum.</typeparam>
+    public void With<TFirst, TSecond>(TSecond second, Action callback) where TSecond : Enum
+    {
+        With<TFirst>(Type<TSecond>.Id(Handle, second), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="first">The first enum constant.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first enum.</typeparam>
+    /// <typeparam name="TSecond">The second component.</typeparam>
+    public void With<TFirst, TSecond>(TFirst first, Action callback) where TFirst : Enum
+    {
+        WithSecond<TSecond>(Type<TFirst>.Id(Handle, first), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="first">The first id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TSecond">The second component.</typeparam>
+    public void WithSecond<TSecond>(ulong first, Action callback)
+    {
+        With(first, Type<TSecond>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created in scope. All operations
+    ///     called in function (such as lookup) are relative to scope.
+    /// </summary>
+    /// <param name="parent">The entity to use as scope.</param>
+    /// <param name="callback">The callback.</param>
+    public void Scope(ulong parent, Action callback)
+    {
+        ulong prev = ecs_set_scope(Handle, parent);
+        callback();
+        ecs_set_scope(Handle, prev);
+    }
+
+    /// <summary>
+    ///     Same as Scope(parent, callback), but with T as parent.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The entity to use as scope.</typeparam>
+    public void Scope<T>(Action callback)
+    {
+        Scope(Type<T>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     Same as Scope(parent, callback), but with enum as parent.
+    /// </summary>
+    /// <param name="value">The entity to use as scope.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The enum.</typeparam>
+    public void Scope<T>(T value, Action callback) where T : Enum
+    {
+        Scope(Type<T>.Id(Handle, value), callback);
+    }
+
+    /// <summary>
+    ///     Use provided scope for operations ran on returned world.
+    /// </summary>
+    /// <param name="parent"></param>
+    /// <returns></returns>
+    public ScopedWorld Scope(ulong parent)
+    {
+        return new ScopedWorld(Handle, parent);
+    }
+
+    /// <summary>
+    ///     Use provided scope for operations ran on returned world.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ScopedWorld Scope<T>()
+    {
+        return Scope(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Use provided scope for operations ran on returned world.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public ScopedWorld Scope<T>(T value) where T : Enum
+    {
+        return Scope(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Use provided scope for operations ran on returned world.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ScopedWorld Scope(string name)
+    {
+        return Scope(Entity(name));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified id.
+    /// </summary>
+    /// <param name="id"></param>
+    public void DeleteWith(ulong id)
+    {
+        ecs_delete_with(Handle, id);
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    public void DeleteWith(ulong first, ulong second)
+    {
+        DeleteWith(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void DeleteWith<T>()
+    {
+        DeleteWith(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified enum.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    public void DeleteWith<T>(T value) where T : Enum
+    {
+        DeleteWith<T>(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void DeleteWith<TFirst>(ulong second)
+    {
+        DeleteWith(Ecs.Pair<TFirst>(second, Handle));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void DeleteWith<TFirst, TSecond>()
+    {
+        DeleteWith(Ecs.Pair<TFirst, TSecond>(Handle));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void DeleteWith<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        DeleteWith<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void DeleteWith<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        DeleteWithSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Delete all entities with specified pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    public void DeleteWithSecond<TSecond>(ulong first)
+    {
+        DeleteWith(Ecs.PairSecond<TSecond>(first, Handle));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified id.
+    /// </summary>
+    /// <param name="id"></param>
+    public void RemoveAll(ulong id)
+    {
+        ecs_remove_all(Handle, id);
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    public void RemoveAll(ulong first, ulong second)
+    {
+        RemoveAll(Ecs.Pair(first, second));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void RemoveAll<T>()
+    {
+        RemoveAll(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified enum.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    public void RemoveAll<T>(T value) where T : Enum
+    {
+        RemoveAll<T>(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void RemoveAll<TFirst>(ulong second)
+    {
+        RemoveAll(Ecs.Pair<TFirst>(second, Handle));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified pair.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void RemoveAll<TFirst, TSecond>()
+    {
+        RemoveAll(Ecs.Pair<TFirst, TSecond>(Handle));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void RemoveAll<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        RemoveAll<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void RemoveAll<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        RemoveAllSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Remove all instances of specified pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    public void RemoveAllSecond<TSecond>(ulong first)
+    {
+        RemoveAll(Ecs.PairSecond<TSecond>(first, Handle));
+    }
+
+    /// <summary>
+    ///     Defer all operations called in function. If the world is already in
+    ///     deferred mode, do nothing.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    public void Defer(Action callback)
+    {
+        ecs_defer_begin(Handle);
+        callback();
+        ecs_defer_end(Handle);
+    }
+
+    /// <summary>
+    ///     Suspend deferring operations.
+    /// </summary>
+    public void DeferSuspend()
+    {
+        ecs_defer_suspend(Handle);
+    }
+
+    /// <summary>
+    ///     Resume deferring operations.
+    /// </summary>
+    public void DeferResume()
+    {
+        ecs_defer_resume(Handle);
+    }
+
+    /// <summary>
+    ///     Check if entity id exists in the world.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public bool Exists(ulong entity)
+    {
+        return ecs_exists(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Check if entity id exists in the world.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public bool IsAlive(ulong entity)
+    {
+        return ecs_is_alive(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Check if entity id is valid.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public bool IsValid(ulong entity)
+    {
+        return ecs_is_valid(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Get alive entity for id.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public Entity GetAlive(ulong entity)
+    {
+        return Entity(ecs_get_alive(Handle, entity));
+    }
+
+    /// <summary>
+    ///     Ensures that entity with provided generation is alive.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public Entity MakeAlive(ulong entity)
+    {
+        ecs_make_alive(Handle, entity);
+        return Entity(entity);
+    }
+
+    /// <summary>
+    ///     Override the generation of an entity.
+    /// </summary>
+    /// <param name="entity">The entity for which to set the generation with the new generation.</param>
+    public void SetVersion(ulong entity)
+    {
+        ecs_set_version(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Run callback after completing frame.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    public void RunPostFrame(Ecs.PostFrameCallback callback)
+    {
+        PostFrameContext* postFrameContext = AllocatePostFrameContext();
+        postFrameContext->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.PostFrameCallbackDelegate);
+        ecs_run_post_frame(Handle, &Functions.PostFrameCallback, postFrameContext);
+    }
+
+    /// <summary>
+    ///     Run callback after completing frame.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    public void RunPostFrame(delegate*<World, void> callback)
+    {
+        PostFrameContext* postFrameContext = AllocatePostFrameContext();
+        postFrameContext->Callback.Set(callback, (delegate*<ecs_world_t*, void*, void>)&Functions.PostFrameCallbackPointer);
+        ecs_run_post_frame(Handle, &Functions.PostFrameCallback, postFrameContext);
+    }
+
+    /// <summary>
+    ///     Get the world info.
+    /// </summary>
+    /// <returns></returns>
+    public WorldInfo GetInfo()
+    {
+        return new WorldInfo(ecs_get_world_info(Handle));
+    }
+
+    /// <summary>
+    ///     Get delta time.
+    /// </summary>
+    /// <returns></returns>
+    public float DeltaTime()
+    {
+        return ecs_get_world_info(Handle)->delta_time;
+    }
+
+    /// <summary>
+    ///     Get default id.
+    /// </summary>
+    /// <returns></returns>
+    [SuppressMessage("Usage", "CA1822")]
+    public Id Id()
+    {
+        return default;
+    }
+
+    /// <summary>
+    ///     Get id from string expression.
+    /// </summary>
+    /// <param name="expr">The string expression.</param>
+    /// <returns></returns>
+    public Id Id(string expr)
+    {
+        return new Id(Handle, expr);
+    }
+
+    /// <summary>
+    ///     Get id from id value.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public Id Id(ulong id)
+    {
+        return new Id(Handle, id);
+    }
+
+    /// <summary>
+    ///     Get pair from id values.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public Id Id(ulong first, ulong second)
+    {
+        return new Id(Handle, first, second);
+    }
+
+    /// <summary>
+    ///     Get id from a type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Id Id<T>()
+    {
+        return new Id(Handle, Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Get id from an enum.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Id Id<T>(T value) where T : Enum
+    {
+        return new Id(Handle, Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public Id Id<TFirst>(ulong second)
+    {
+        return Id(Type<TFirst>.Id(Handle), second);
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id Id<TFirst, TSecond>()
+    {
+        return Id(Type<TFirst>.Id(Handle), Type<TSecond>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id Id<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Id<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id Id<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return IdSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id IdSecond<TSecond>(ulong first)
+    {
+        return Id(first, Type<TSecond>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public Id Pair(ulong first, ulong second)
+    {
+        return Id(first, second);
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Id Pair<T>(T value) where T : Enum
+    {
+        return Id<T>(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public Id Pair<TFirst>(ulong second)
+    {
+        return Id<TFirst>(second);
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id Pair<TFirst, TSecond>()
+    {
+        return Id<TFirst, TSecond>();
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id Pair<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Pair<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id Pair<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return PairSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Get pair id.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Id PairSecond<TSecond>(ulong first)
+    {
+        return IdSecond<TSecond>(first);
+    }
+
+    /// <summary>
+    ///     Creates an <see cref="UntypedComponent"/>.
+    /// </summary>
+    /// <returns></returns>
+    public UntypedComponent Component()
+    {
+        return new UntypedComponent(Handle);
+    }
+
+    /// <summary>
+    ///     Creates an <see cref="UntypedComponent"/> from id.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public UntypedComponent Component(ulong id)
+    {
+        return new UntypedComponent(Handle, id);
+    }
+
+    /// <summary>
+    ///     Creates an <see cref="UntypedComponent"/> from name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public UntypedComponent Component(string name)
+    {
+        return new UntypedComponent(Handle, name);
+    }
+
+    /// <summary>
+    ///     Find or register component.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Component<T> Component<T>()
+    {
+        return new Component<T>(Handle);
+    }
+
+    /// <summary>
+    ///     Get component associated with name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Component<T> Component<T>(string name)
+    {
+        return new Component<T>(Handle, name);
+    }
+
+    /// <summary>
+    ///     Get component with associated with id.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Component<T> Component<T>(ulong id)
+    {
+        return new Component<T>(Handle, id);
+    }
+
+    /// <summary>
+    ///     Creates an entity.
+    /// </summary>
+    /// <returns></returns>
+    public Entity Entity()
+    {
+        return new Entity(Handle);
+    }
+
+    /// <summary>
+    ///     Creates an entity from id.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public Entity Entity(ulong id)
+    {
+        return new Entity(Handle, id);
+    }
+
+    /// <summary>
+    ///     Creates an entity from name.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public Entity Entity(string name)
+    {
+        return new Entity(Handle, name);
+    }
+
+    /// <summary>
+    ///     Creates an entity from type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Entity<T>()
+    {
+        return new Entity(Handle, Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Creates an entity that's associated with a type.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Entity<T>(string name)
+    {
+        return new Entity(Handle, Type<T>.Id(Handle, false, false, 0, name));
+    }
+
+    /// <summary>
+    ///     Convert enum constant to entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Entity<T>(T value) where T : Enum
+    {
+        return new Entity(Handle, Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Creates a prefab.
+    /// </summary>
+    /// <returns></returns>
+    public Entity Prefab()
+    {
+        return new Entity(Handle).Add(EcsPrefab);
+    }
+
+    /// <summary>
+    ///     Creates a prefab with the provided name.
+    /// </summary>
+    /// <returns></returns>
+    public Entity Prefab(string name)
+    {
+        return new Entity(Handle, name).Add(EcsPrefab);
+    }
+
+    /// <summary>
+    ///     Creates a prefab that's associated with a type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Prefab<T>()
+    {
+        Ecs.Assert( typeof(T).GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).Length == 0, "Prefab types cannot have fields, while the following type does: " + Type<T>.FullName);
+        return new Entity(Handle, Type<T>.Id(Handle, false, false, 0)).Add(EcsPrefab);
+    }
+
+    /// <summary>
+    ///     Creates a prefab that's associated with a type.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Prefab<T>(string name)
+    {
+        Ecs.Assert( typeof(T).GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).Length == 0, "Prefab types cannot have fields, while the following type does: " + Type<T>.FullName);
+        return new Entity(Handle, Type<T>.Id(Handle, false, false, 0, name)).Add(EcsPrefab);
+    }
+
+    /// <summary>
+    ///     Creates a new event.
+    /// </summary>
+    /// <param name="eventId"></param>
+    /// <returns></returns>
+    public EventBuilder Event(ulong eventId)
+    {
+        return new EventBuilder(Handle, eventId);
+    }
+
+    /// <summary>
+    ///     Creates a new event.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public EventBuilder Event<T>()
+    {
+        return new EventBuilder(Handle, Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Creates a new event.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public EventBuilder Event<T>(T value) where T : Enum
+    {
+        return new EventBuilder(Handle, Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <returns></returns>
+    public Term Term()
+    {
+        return new Term(Handle);
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public Term Term(ecs_term_t value)
+    {
+        return new Term(Handle, value);
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public Term Term(ulong id)
+    {
+        return new Term(Handle, id);
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <returns></returns>
+    public Term Term(ulong first, ulong second)
+    {
+        return new Term(Handle, first, second);
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Term Term<T>()
+    {
+        return new Term(Handle, Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Term Term<T>(T value) where T : Enum
+    {
+        return Term<T>(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <returns></returns>
+    public Term Term<TFirst>(ulong second)
+    {
+        return new Term(Handle, Ecs.Pair<TFirst>(second, Handle));
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Term Term<TFirst, TSecond>()
+    {
+        return new Term(Handle, Ecs.Pair<TFirst, TSecond>(Handle));
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Term Term<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        return Term<TFirst>(Type<TSecond>.Id(Handle, second));
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Term Term<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        return TermSecond<TSecond>(Type<TFirst>.Id(Handle, first));
+    }
+
+    /// <summary>
+    ///     Creates a new term.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    /// <returns></returns>
+    public Term TermSecond<TSecond>(ulong first)
+    {
+        return new Term(Handle, Ecs.PairSecond<TSecond>(first, Handle));
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided (component) id.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="callback"></param>
+    public void Each(ulong id, Ecs.EachEntityCallback callback)
+    {
+        ecs_iter_t it = ecs_each_id(Handle, id);
+        while (ecs_each_next(&it))
+            Invoker.Each(&it, callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="second"></param>
+    /// <param name="callback"></param>
+    public void Each(ulong first, ulong second, Ecs.EachEntityCallback callback)
+    {
+        Each(Ecs.Pair(first, second), callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="callback"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Each<T>(T value, Ecs.EachEntityRefCallback<T> callback) where T : Enum
+    {
+        Each(Type<T>.Id(Handle, value), callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    public void Each<TFirst>(ulong second, Ecs.EachEntityRefCallback<TFirst> callback)
+    {
+        ecs_iter_t it = ecs_each_id(Handle, Ecs.Pair<TFirst>(second, Handle));
+        while (ecs_each_next(&it))
+            Invoker.Each(&it, callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Each<TFirst, TSecond>(Ecs.EachEntityCallback callback)
+    {
+        Each(Pair<TFirst, TSecond>(), callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Each<TFirst, TSecond>(Ecs.EachEntityRefCallback<TFirst> callback)
+    {
+        Each(Type<TSecond>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Each<TFirst, TSecond>(Ecs.EachEntityRefCallback<TSecond> callback)
+    {
+        EachSecond(Type<TFirst>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="second"></param>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Each<TFirst, TSecond>(TSecond second, Ecs.EachEntityRefCallback<TFirst> callback) where TSecond : Enum
+    {
+        Each(Type<TSecond>.Id(Handle, second), callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="callback"></param>
+    /// <typeparam name="TFirst"></typeparam>
+    /// <typeparam name="TSecond"></typeparam>
+    public void Each<TFirst, TSecond>(TFirst first, Ecs.EachEntityRefCallback<TSecond> callback) where TFirst : Enum
+    {
+        EachSecond(Type<TFirst>.Id(Handle, first), callback);
+    }
+
+    /// <summary>
+    ///     Iterate over all entities with the provided pair.
+    /// </summary>
+    /// <param name="first"></param>
+    /// <param name="callback"></param>
+    /// <typeparam name="TSecond"></typeparam>
+    public void EachSecond<TSecond>(ulong first, Ecs.EachEntityRefCallback<TSecond> callback)
+    {
+        ecs_iter_t it = ecs_each_id(Handle, Ecs.PairSecond<TSecond>(first, Handle));
+        while (ecs_each_next(&it))
+            Invoker.Each(&it, callback);
+    }
+
+    /// <summary>
+    ///     Convert enum constant to entity.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity ToEntity<T>(T value) where T : Enum
+    {
+        return Entity(value);
+    }
+
+    /// <summary>
+    ///     Define a module.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <typeparam name="TModule"></typeparam>
+    /// <returns></returns>
+    public Entity Module<TModule>(string name = "") where TModule : IFlecsModule, new()
+    {
+        Entity result = Entity(Type<TModule>.Id(Handle));
+
+        if (string.IsNullOrEmpty(name))
+            return Entity(result);
+
+        using NativeString nativeName = (NativeString)name;
+
+        Entity prevParent = result.Parent();
+        ecs_add_path_w_sep(Handle, result, 0, nativeName, Pointers.DefaultSeparator, Pointers.DefaultSeparator);
+        Entity parent = result.Parent();
+
+        if (prevParent == parent)
+            return Entity(result);
+
+        if (parent != 0)
+            parent.Add(Ecs.Module);
+
+        // Module was reparented, cleanup old parent(s)
+        Entity current = prevParent;
+
+        while (current != 0)
+        {
+            Entity next = current.Parent();
+
+            ecs_iter_t it = ecs_each_id(Handle, Pair(Ecs.ChildOf, current));
+
+            if (!ecs_iter_is_true(&it))
+            {
+                current.Destruct();
+                SetVersion(current);
+            }
+
+            current = next;
+        }
+
+        return Entity(result);
+    }
+
+    /// <summary>
+    ///     Imports a module.
+    /// </summary>
+    /// <typeparam name="T">The module type.</typeparam>
+    /// <returns>The module entity.</returns>
+    public Entity Import<T>() where T : IFlecsModule, new()
+    {
+        return Ecs.Import<T>(this);
+    }
+
+    /// <summary>
+    ///     Set pipeline.
+    /// </summary>
+    /// <param name="pipeline"></param>
+    public void SetPipeline(ulong pipeline)
+    {
+        ecs_set_pipeline(Handle, pipeline);
+    }
+
+    /// <summary>
+    ///     Set pipeline.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public void SetPipeline<T>()
+    {
+        SetPipeline(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Set pipeline.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    public void SetPipeline<T>(T value) where T : Enum
+    {
+        SetPipeline(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Get pipeline.
+    /// </summary>
+    /// <returns></returns>
+    public Entity GetPipeline()
+    {
+        return Entity(ecs_get_pipeline(Handle));
+    }
+
+    /// <summary>
+    ///     Progress world one tick.
+    /// </summary>
+    /// <returns></returns>
+    public bool Progress(float deltaTime = 0)
+    {
+        return ecs_progress(Handle, deltaTime);
+    }
+
+    /// <summary>
+    ///     Run pipeline.
+    /// </summary>
+    /// <param name="pipeline"></param>
+    /// <param name="deltaTime"></param>
+    public void RunPipeline(ulong pipeline, float deltaTime = 0)
+    {
+        ecs_run_pipeline(Handle, pipeline, deltaTime);
+    }
+
+    /// <summary>
+    ///     Run pipeline.
+    /// </summary>
+    /// <param name="deltaTime"></param>
+    /// <typeparam name="TPipeline"></typeparam>
+    public void RunPipeline<TPipeline>(float deltaTime = 0)
+    {
+        ecs_run_pipeline(Handle, Type<TPipeline>.Id(Handle), deltaTime);
+    }
+
+    /// <summary>
+    ///     Set timescale.
+    /// </summary>
+    /// <param name="scale"></param>
+    public void SetTimeScale(float scale)
+    {
+        ecs_set_time_scale(Handle, scale);
+    }
+
+    /// <summary>
+    ///     Set target FPS.
+    /// </summary>
+    /// <param name="targetFps"></param>
+    public void SetTargetFps(float targetFps)
+    {
+        ecs_set_target_fps(Handle, targetFps);
+    }
+
+    /// <summary>
+    ///     Reset simulation clock.
+    /// </summary>
+    public void ResetClock()
+    {
+        ecs_reset_clock(Handle);
+    }
+
+    /// <summary>
+    ///     Set number of threads.
+    /// </summary>
+    /// <param name="threads"></param>
+    public void SetThreads(int threads)
+    {
+        ecs_set_threads(Handle, threads);
+    }
+
+    /// <summary>
+    ///     Set number of threads.
+    /// </summary>
+    /// <returns></returns>
+    public int GetThreads()
+    {
+        return ecs_get_stage_count(Handle);
+    }
+
+    /// <summary>
+    ///     Set number of task threads.
+    /// </summary>
+    /// <param name="taskThreads"></param>
+    public void SetTaskThreads(int taskThreads)
+    {
+        ecs_set_task_threads(Handle, taskThreads);
+    }
+
+    /// <summary>
+    ///     Returns true if task thread use has been requested.
+    /// </summary>
+    /// <returns></returns>
+    public bool UsingTaskThreads()
+    {
+        return ecs_using_task_threads(Handle);
+    }
+
+    /// <summary>
+    ///     Creates a timer.
+    /// </summary>
+    /// <returns></returns>
+    public TimerEntity Timer()
+    {
+        return new TimerEntity(Handle);
+    }
+
+    /// <summary>
+    ///     Creates a timer.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public TimerEntity Timer(ulong id)
+    {
+        return new TimerEntity(Handle, id);
+    }
+
+    /// <summary>
+    ///     Creates a timer.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public TimerEntity Timer(string name)
+    {
+        return new TimerEntity(Handle, name);
+    }
+
+    /// <summary>
+    ///     Creates a timer.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public TimerEntity Timer<T>()
+    {
+        return Timer(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Creates a timer.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    public void Timer<T>(T value) where T : Enum
+    {
+        Timer(Type<T>.Id(Handle, value));
+    }
+
+    /// <summary>
+    ///     Enable randomization of initial time values for timers.
+    /// </summary>
+    public void RandomizeTimers()
+    {
+        ecs_randomize_timers(Handle);
+    }
+
+    /// <summary>
+    ///     Run script.
+    /// </summary>
+    /// <param name="name">The script name (typically the file).</param>
+    /// <param name="str">The script.</param>
+    /// <returns>Zero if success, non-zero otherwise.</returns>
+    public int ScriptRun(string name, string str)
+    {
+        using NativeString nativeName = (NativeString)name;
+        using NativeString nativeStr = (NativeString)str;
+
+        return ecs_script_run(Handle, nativeName, nativeStr);
+    }
+
+    /// <summary>
+    ///     Run script from file.
+    /// </summary>
+    /// <param name="fileName">The script file name.</param>
+    /// <returns>Zero if success, non-zero if failed.</returns>
+    public int ScriptRunFile(string fileName)
+    {
+        using NativeString nativeFileName = (NativeString)fileName;
+        return ecs_script_run_file(Handle, nativeFileName);
+    }
+
+    /// <summary>
+    ///     Creates a script builder.
+    /// </summary>
+    /// <returns>The created script builder.</returns>
+    public ScriptBuilder Script()
+    {
+        return new ScriptBuilder(Handle);
+    }
+
+    /// <summary>
+    ///     Creates a script builder with the provided entity name.
+    /// </summary>
+    /// <param name="name">The entity name.</param>
+    /// <returns>The created script builder.</returns>
+    public ScriptBuilder Script(string name)
+    {
+        return new ScriptBuilder(Handle, name);
+    }
+
+    private readonly List<Delegate> ScriptCallbacks = new();
+    private readonly Type TypesType = typeof(Type<>);
+    private readonly Dictionary<Type, ulong> ScriptTypeIds = new();
+    public void AddFunction(Delegate function, string? nameOverride = null, string[]? argumentOverrides = null)
+    {
+        AddFunctionImpl(function, nameOverride, argumentOverrides);
+    }
+
+    public void AddMethod(ulong parent, Delegate function, string? nameOverride = null, string[]? argumentOverrides = null)
+    {
+        AddFunctionImpl(function, nameOverride, argumentOverrides, parent: parent);
+    }
+
+    public void AddMethod<T>(Delegate function, string? nameOverride = null, string[]? argumentOverrides = null)
+    {
+        AddFunctionImpl(function, nameOverride, argumentOverrides, parent: Type<T>.Id(Handle));
+    }
+
+    internal void AddFunctionImpl(Delegate function, string? nameOverride, string[]? argumentOverrides, ulong parent = default)
+    {
+        using NativeString nativeName = (NativeString)(nameOverride ?? function.Method.Name);
+        InlineArrays.ecs_script_parameter_t_16 scriptParamsRaw = default;
+        ecs_script_parameter_t* scriptParams = (ecs_script_parameter_t * ) &scriptParamsRaw;
+
+        List<IDisposable> cleanup = new();
+        try
+        {
+            var args = function.Method.GetParameters();
+            for (int i = 0; i < args.Length; ++i)
+            {
+                cleanup.Add((NativeString)args[i].Name);
+                NativeString argName = (NativeString)cleanup[^-1];
+
+                if (!ScriptTypeIds.TryGetValue(args[i].ParameterType, out ulong argTypeId))
+                {
+                    ScriptTypeIds.Add(args[i].ParameterType, argTypeId = (ulong) TypesType.MakeGenericType(args[i].ParameterType).GetMethod(nameof(Type<string>.Id), [typeof(ecs_world_t*)])!.Invoke(null, [new IntPtr(Handle)])!);
+                }
+
+                scriptParams[i] = new()
+                {
+                    name = argName,
+                    type = argTypeId,
+                };
+            }
+
+
+            if (!ScriptTypeIds.TryGetValue(function.Method.ReturnType, out ulong retTypeId))
+            {
+                ScriptTypeIds.Add(function.Method.ReturnType, retTypeId = (ulong)TypesType.MakeGenericType(function.Method.ReturnType).GetMethod(nameof(Type<string>.Id), [typeof(ecs_world_t*)])!.Invoke(null, [new IntPtr(Handle)])!);
+            }
+
+            ecs_function_desc_t desc = new()
+            {
+                name = nativeName,
+                parent = parent,
+                @params = scriptParamsRaw,
+                return_type = retTypeId,
+                callback = &ScriptCallableCallback,
+                ctx = (void*)ScriptCallbacks.Count
+            };
+
+            ScriptCallbacks.Add(function);
+            ecs_function_init(Handle, &desc);
+        }
+        finally
+        {
+            foreach (var entry in cleanup)
+            {
+                entry.Dispose();
+            }
+        }
+    }
+
+    [UnmanagedCallersOnly]
+    public static void ScriptCallableCallback(ecs_function_ctx_t* ctx, int argc, ecs_value_t* argv, ecs_value_t* result)
+    {
+        World world = (World) ecs_get_binding_ctx_fast(ctx->world);
+        int ind = (int)ctx->ctx;
+        var del = world.ScriptCallbacks[ind];
+
+        object[] args = new object[argc];
+        var paramInfo = del.Method.GetParameters();
+        for (int i = 0; i < argc; i++)
+        {
+            Type argType = paramInfo[i].ParameterType;
+            args[i] = Managed.Get(argType, argv[i].ptr);
+        }
+
+        var ret = del.DynamicInvoke(args);
+        ecs_type_info_t* retType = ecs_get_type_info(ctx->world, result->type);
+        retType->hooks.copy(result->ptr, &ret, 1, retType);
+    }
+
+    public void AddConstant<T>(ulong parent, string name, T value)
+    {
+        using NativeString nativeName = (NativeString)name;
+
+        ecs_const_var_desc_t desc = default;
+        desc.name = nativeName;
+        desc.parent = parent;
+        desc.type = Type<T>.Id(Handle);
+
+        T* ptrValue = &value;
+        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+        {
+            Managed.AllocGcHandle(ptrValue, out GCHandle handle);
+            desc.value = &handle;
+            ecs_const_var_init(Handle, &desc);
+            Managed.FreeGcHandle(handle);
+        }
+        else
+        {
+            desc.value = ptrValue;
+            ecs_const_var_init(Handle, &desc);
+        }
+    }
+
+    public void AddConstant<T>(string name, T value)
+    {
+        AddConstant(default, name, value);
+    }
+
+    /// <summary>
+    ///     Convert value to string.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public string ToExpr(ulong id, void* value)
+    {
+        return NativeString.GetStringAndFree(ecs_ptr_to_expr(Handle, id, value));
+    }
+
+    /// <summary>
+    ///     Convert value to string.
+    /// </summary>
+    /// <param name="value">The value to serialize.</param>
+    /// <typeparam name="T">The type of the value to serialize.</typeparam>
+    /// <returns>String with expression, or empty string if failed.</returns>
+    public string ToExpr<T>(T* value) where T : unmanaged
+    {
+        return ToExpr(Type<T>.Id(Handle), value);
+    }
+
+    /// <summary>
+    ///     Covert value to string.
+    /// </summary>
+    /// <param name="value">The value to serialize.</param>
+    /// <typeparam name="T">The type of the value to serialize.</typeparam>
+    /// <returns>String with expression, or empty string if failed.</returns>
+    public string ToExpr<T>(ref T value) where T : unmanaged
+    {
+        fixed (T* ptr = &value)
+        {
+            return ToExpr(ptr);
+        }
+    }
+
+    /// <summary>
+    ///     Return meta cursor to value.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    public Cursor Cursor(ulong id, void* data)
+    {
+        return new Cursor(Handle, id, data);
+    }
+
+    /// <summary>
+    ///     Return meta cursor to value.
+    /// </summary>
+    /// <param name="data"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Cursor Cursor<T>(T* data)
+    {
+        return Cursor(Type<T>.Id(Handle), data);
+    }
+
+    /// <summary>
+    ///     Return meta cursor to value.
+    /// </summary>
+    /// <param name="data"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    // TODO: Figure out better api that doesn't cause GC hole
+    public Cursor Cursor<T>(ref T data) where T : unmanaged
+    {
+        fixed (T* ptr = &data)
+        {
+            return Cursor(ptr);
+        }
+    }
+
+    /// <summary>
+    ///     Create primitive type.
+    /// </summary>
+    /// <param name="kind"></param>
+    /// <returns></returns>
+    public Entity Primitive(ecs_primitive_kind_t kind)
+    {
+        ecs_primitive_desc_t desc = default;
+        desc.kind = kind;
+
+        ulong id = ecs_primitive_init(Handle, &desc);
+        Ecs.Assert(id != 0, nameof(ECS_INVALID_OPERATION));
+
+        return Entity(id);
+    }
+
+    /// <summary>
+    ///     Creates array type.
+    /// </summary>
+    /// <param name="elemId"></param>
+    /// <param name="arrayCount"></param>
+    /// <returns></returns>
+    public Entity Array(ulong elemId, int arrayCount)
+    {
+        ecs_array_desc_t desc = default;
+        desc.type = elemId;
+        desc.count = arrayCount;
+
+        ulong id = ecs_array_init(Handle, &desc);
+        Ecs.Assert(id != 0, nameof(ECS_INVALID_OPERATION));
+
+        return Entity(id);
+    }
+
+    /// <summary>
+    ///     Creates array type.
+    /// </summary>
+    /// <param name="arrayCount"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Array<T>(int arrayCount)
+    {
+        return Array(Type<T>.Id(Handle), arrayCount);
+    }
+
+    /// <summary>
+    ///     Create vector type.
+    /// </summary>
+    /// <param name="elemId"></param>
+    /// <returns></returns>
+    public Entity Vector(ulong elemId)
+    {
+        ecs_vector_desc_t desc = default;
+        desc.type = elemId;
+        ulong id = ecs_vector_init(Handle, &desc);
+        Ecs.Assert(id != 0, nameof(ECS_INVALID_OPERATION));
+        return Entity(id);
+    }
+
+    /// <summary>
+    ///     Create vector type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public Entity Vector<T>()
+    {
+        return Vector(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Serialize untyped value to JSON.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public string ToJson(ulong id, void* value)
+    {
+        return NativeString.GetStringAndFree(ecs_ptr_to_json(Handle, id, value));
+    }
+
+    /// <summary>
+    ///     Serialize value to JSON.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    // TODO: Support managed types with ToJson and FromJson.
+    public string ToJson<T>(T* value) where T : unmanaged
+    {
+        return ToJson(Type<T>.Id(Handle), value);
+    }
+
+    /// <summary>
+    ///     Serialize value to JSON.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public string ToJson<T>(ref T value) where T : unmanaged
+    {
+        fixed (T* ptr = &value)
+        {
+            return ToJson(ptr);
+        }
+    }
+
+    /// <summary>
+    ///     Serializes the world to a JSON string using the provided description.
+    /// </summary>
+    /// <param name="desc">The description settings for JSON serialization.</param>
+    /// <returns>A JSON string with the serialized world data, or an empty string if failed.</returns>
+    public string ToJson(in WorldToJsonDesc desc)
+    {
+        fixed (ecs_world_to_json_desc_t* ptr = &desc.Desc)
+            return NativeString.GetStringAndFree(ecs_world_to_json(Handle, ptr));
+    }
+
+    /// <summary>
+    ///     Serializes the world to a JSON string.
+    /// </summary>
+    /// <returns>A JSON string with the serialized world data, or an empty string if failed.</returns>
+    public string ToJson()
+    {
+        return NativeString.GetStringAndFree(ecs_world_to_json(Handle, null));
+    }
+
+    /// <summary>
+    ///     Deserialize value from JSON.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="value"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <returns></returns>
+    public bool FromJson(ulong id, void* value, string json, ecs_from_json_desc_t* desc = null)
+    {
+        using NativeString nativeJson = (NativeString)json;
+        return ecs_ptr_from_json(Handle, id, value, nativeJson, desc) != null;
+    }
+
+    /// <summary>
+    ///     Deserialize value from JSON.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public bool FromJson<T>(T* value, string json, ecs_from_json_desc_t* desc = null) where T : unmanaged
+    {
+        return FromJson(Type<T>.Id(Handle), value, json, desc);
+    }
+
+    /// <summary>
+    ///     Deserialize value from JSON.
+    /// </summary>
+    /// <param name="json"></param>
+    /// <param name="desc"></param>
+    /// <returns></returns>
+    public bool FromJson(string json, ecs_from_json_desc_t* desc)
+    {
+        using NativeString nativeJson = (NativeString)json;
+        return ecs_world_from_json(Handle, nativeJson, desc) != null;
+    }
+
+    /// <summary>
+    ///     Deserialize value from JSON.
+    /// </summary>
+    /// <param name="json"></param>
+    /// <returns></returns>
+    public bool FromJson(string json)
+    {
+        using NativeString nativeJson = (NativeString)json;
+        return FromJson(json, null);
+    }
+
+    /// <summary>
+    ///     Deserialize JSON file into world.
+    /// </summary>
+    /// <param name="file"></param>
+    /// <param name="desc"></param>
+    /// <returns></returns>
+    public bool FromJsonFile(string file, ecs_from_json_desc_t *desc)
+    {
+        using NativeString nativeFile = (NativeString)file;
+        return ecs_world_from_json_file(Handle, nativeFile, desc) != null;
+    }
+
+    /// <summary>
+    ///     Deserialize JSON file into world.
+    /// </summary>
+    /// <param name="file"></param>
+    /// <returns></returns>
+    public bool FromJsonFile(string file)
+    {
+        return FromJsonFile(file, null);
+    }
+
+    /// <summary>
+    ///     Creates an app builder.
+    /// </summary>
+    /// <returns></returns>
+    public AppBuilder App()
+    {
+        return new AppBuilder(Handle);
+    }
+
+    /// <summary>
+    ///     Create metric builder.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    public MetricBuilder Metric(ulong entity)
+    {
+        return new MetricBuilder(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Creates an alert builder.
+    /// </summary>
+    /// <returns>An alert builder.</returns>
+    public AlertBuilder AlertBuilder()
+    {
+        return new AlertBuilder(Handle);
+    }
+
+    /// <summary>
+    ///     Creates an alert builder.
+    /// </summary>
+    /// <param name="name">The alert name.</param>
+    /// <returns>An alert builder.</returns>
+    public AlertBuilder AlertBuilder(string name)
+    {
+        return new AlertBuilder(Handle, name);
+    }
+
+    /// <summary>
+    ///     Creates an alert builder.
+    /// </summary>
+    /// <param name="entity">The alert entity.</param>
+    /// <returns>An alert builder.</returns>
+    public AlertBuilder AlertBuilder(ulong entity)
+    {
+        return new AlertBuilder(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Creates an alert.
+    /// </summary>
+    /// <returns>An alert.</returns>
+    public Alert Alert()
+    {
+        return AlertBuilder().Build();
+    }
+
+    /// <summary>
+    ///     Creates an alert.
+    /// </summary>
+    /// <param name="name">The alert name.</param>
+    /// <returns>An alert.</returns>
+    public Alert Alert(string name)
+    {
+        return AlertBuilder(name).Build();
+    }
+
+    /// <summary>
+    ///     Creates an alert.
+    /// </summary>
+    /// <param name="entity">The alert entity.</param>
+    /// <returns>An alert.</returns>
+    public Alert Alert(ulong entity)
+    {
+        return AlertBuilder(entity).Build();
+    }
+
+    /// <summary>
+    ///     Creates a query builder.
+    /// </summary>
+    /// <returns>A query builder.</returns>
+    public QueryBuilder QueryBuilder()
+    {
+        return new QueryBuilder(Handle);
+    }
+
+    /// <summary>
+    ///     Creates a query builder.
+    /// </summary>
+    /// <param name="name">The query name.</param>
+    /// <returns>A query builder.</returns>
+    public QueryBuilder QueryBuilder(string name)
+    {
+        return new QueryBuilder(Handle, name);
+    }
+
+    /// <summary>
+    ///     Creates a query builder.
+    /// </summary>
+    /// <param name="entity">The query entity.</param>
+    /// <returns>A query builder.</returns>
+    public QueryBuilder QueryBuilder(ulong entity)
+    {
+        return new QueryBuilder(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Creates a query.
+    /// </summary>
+    /// <returns>A query.</returns>
+    public Query Query()
+    {
+        return QueryBuilder().Build();
+    }
+
+    /// <summary>
+    ///     Creates a query.
+    /// </summary>
+    /// <param name="name">The query name.</param>
+    /// <returns>A query.</returns>
+    public Query Query(string name)
+    {
+        return new Query(Handle, Lookup(name));
+    }
+
+    /// <summary>
+    ///     Creates a query.
+    /// </summary>
+    /// <param name="entity">The query entity.</param>
+    /// <returns>A query.</returns>
+    public Query Query(ulong entity)
+    {
+        return new Query(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Creates a pipeline builder.
+    /// </summary>
+    /// <returns>A pipeline builder.</returns>
+    public PipelineBuilder Pipeline()
+    {
+        return new PipelineBuilder(Handle);
+    }
+
+    /// <summary>
+    ///     Creates a pipeline builder.
+    /// </summary>
+    /// <param name="name">The pipeline name.</param>
+    /// <returns>A pipeline builder.</returns>
+    public PipelineBuilder Pipeline(string name)
+    {
+        return new PipelineBuilder(Handle, name);
+    }
+
+    /// <summary>
+    ///     Creates a pipeline builder.
+    /// </summary>
+    /// <param name="entity">The pipeline entity.</param>
+    /// <returns>A pipeline builder.</returns>
+    public PipelineBuilder Pipeline(ulong entity)
+    {
+        return new PipelineBuilder(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Creates a pipeline builder associated with the provided type.
+    /// </summary>
+    /// <returns>A pipeline builder.</returns>
+    public PipelineBuilder Pipeline<T>()
+    {
+        return Pipeline(Type<T>.Id(Handle));
+    }
+
+    /// <summary>
+    ///     Creates an observer builder.
+    /// </summary>
+    /// <returns>An observer builder.</returns>
+    public ObserverBuilder Observer()
+    {
+        return new ObserverBuilder(Handle);
+    }
+
+    /// <summary>
+    ///     Creates an observer builder.
+    /// </summary>
+    /// <param name="name">The observer name.</param>
+    /// <returns>An observer builder.</returns>
+    public ObserverBuilder Observer(string name)
+    {
+        return new ObserverBuilder(Handle, name);
+    }
+
+    /// <summary>
+    ///     Creates an observer.
+    /// </summary>
+    /// <param name="entity">The observer entity.</param>
+    /// <returns>An observer.</returns>
+    public Observer Observer(ulong entity)
+    {
+        return new Observer(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Creates a system builder.
+    /// </summary>
+    /// <returns>A system builder.</returns>
+    public SystemBuilder System()
+    {
+        return new SystemBuilder(Handle);
+    }
+
+    /// <summary>
+    ///     Creates a system builder.
+    /// </summary>
+    /// <param name="name">The system name.</param>
+    /// <returns>A system builder.</returns>
+    public SystemBuilder System(string name)
+    {
+        return new SystemBuilder(Handle, name);
+    }
+
+    /// <summary>
+    ///     Create a system.
+    /// </summary>
+    /// <param name="entity">The system entity.</param>
+    /// <returns>A system.</returns>
+    public System_ System(ulong entity)
+    {
+        return new System_(Handle, entity);
+    }
+
+    /// <summary>
+    ///     Initializes built-in components.
+    /// </summary>
+    public void InitBuiltinComponents()
+    {
+        Import<Ecs.Meta>();
+    }
+
+    internal WorldContext* GetBindingContext()
+    {
+        return (WorldContext*)ecs_get_binding_ctx_fast(Handle);
+    }
+
+    private WorldContext* EnsureBindingContext()
+    {
+        WorldContext* ptr = (WorldContext*)ecs_get_binding_ctx_fast(Handle);
+
+        if (ptr != null)
+            return ptr;
+
+        ptr = Memory.AllocZeroed<WorldContext>(1);
+        ecs_set_binding_ctx(Handle, ptr, &Functions.WorldContextFree);
+        return ptr;
+    }
+
+    private PostFrameContext* AllocatePostFrameContext()
+    {
+        PostFrameContext* context = Memory.Alloc<PostFrameContext>(1);
+        WorldContext.RunPostFrameContexts.Add((nint)context);
+        return context;
+    }
+
+    private WorldFinishContext* AllocateWorldFinishContext()
+    {
+        WorldFinishContext* context = Memory.Alloc<WorldFinishContext>(1);
+        WorldContext.WorldFinishContexts.Add((nint)context);
+        return context;
+    }
+
+    /// <summary>
+    ///     Returns native pointer to world.
+    /// </summary>
+    /// <param name="world"></param>
+    /// <returns></returns>
+    public static ecs_world_t* To(World world)
+    {
+        return world.Handle;
+    }
+
+    /// <summary>
+    ///     Returns world wrapper for native world pointer.
+    /// </summary>
+    /// <param name="world"></param>
+    /// <returns></returns>
+    public static World From(ecs_world_t* world)
+    {
+        return new World(world);
+    }
+
+    /// <summary>
+    ///     Returns native pointer to world.
+    /// </summary>
+    /// <param name="world"></param>
+    /// <returns></returns>
+    public static implicit operator ecs_world_t*(World world)
+    {
+        return To(world);
+    }
+
+    /// <summary>
+    ///     Returns world wrapper for native world pointer.
+    /// </summary>
+    /// <param name="world"></param>
+    /// <returns></returns>
+    public static implicit operator World(ecs_world_t* world)
+    {
+        return From(world);
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="World"/> instances are equal.
+    /// </summary>
+    /// <param name="other"></param>
+    /// <returns></returns>
+    public bool Equals(World other)
+    {
+        return Handle == other.Handle;
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="World"/> instances are equal.
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is World world && Equals(world);
+    }
+
+    /// <summary>
+    ///     Returns the hash code of the <see cref="World"/>.
+    /// </summary>
+    /// <returns></returns>
+    public override int GetHashCode()
+    {
+        return Handle->GetHashCode();
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="World"/> instances are equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator ==(World left, World right)
+    {
+        return left.Equals(right);
+    }
+
+    /// <summary>
+    ///     Checks if two <see cref="World"/> instances are not equal.
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="right"></param>
+    /// <returns></returns>
+    public static bool operator !=(World left, World right)
+    {
+        return !(left == right);
+    }
+}
+
+// Flecs.NET Extensions
+public unsafe partial struct World
+{
+    /// <summary>
+    ///     Gets an empty table.
+    /// </summary>
+    /// <returns></returns>
+    public Table Table()
+    {
+        return new Table(Handle);
+    }
+
+    /// <summary>
+    ///     Create new entity in table.
+    /// </summary>
+    /// <param name="table">The table to which to add the new entity.</param>
+    /// <returns>The new entity.</returns>
+    public Entity Entity(Table table)
+    {
+        return Entity(ecs_new_w_table(Handle, table));
+    }
+
+    /// <summary>
+    ///     Set current with id.
+    /// </summary>
+    /// <param name="with">The id.</param>
+    /// <returns>The previous id.</returns>
+    public Entity SetWith(ulong with)
+    {
+        return new Entity(Handle, ecs_set_with(Handle, with));
+    }
+
+    /// <summary>
+    ///     Get current with id.
+    /// </summary>
+    /// <returns>The last id provided to ecs_set_with().</returns>
+    public Entity GetWith()
+    {
+        return new Entity(Handle, ecs_get_with(Handle));
+    }
+
+    /// <summary>
+    ///     All entities created in function are created in scope. All operations
+    ///     called in function (such as lookup) are relative to scope.
+    /// </summary>
+    /// <param name="parent">The entity to use as scope.</param>
+    /// <param name="callback">The callback.</param>
+    public void Scope(ulong parent, Ecs.WorldCallback callback)
+    {
+        ulong prev = ecs_set_scope(Handle, parent);
+        callback(Handle);
+        ecs_set_scope(Handle, prev);
+    }
+
+    /// <summary>
+    ///     Same as Scope(parent, func), but with T as parent.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The entity to use as scope.</typeparam>
+    public void Scope<T>(Ecs.WorldCallback callback)
+    {
+        Scope(Type<T>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     Same as Scope(parent, func), but with enum as parent.
+    /// </summary>
+    /// <param name="value">The entity to use as scope.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The enum.</typeparam>
+    public void Scope<T>(T value, Ecs.WorldCallback callback) where T : Enum
+    {
+        Scope(Type<T>.Id(Handle, value), callback);
+    }
+
+    /// <summary>
+    ///     Defer all operations called in function. If the world is already in
+    ///     deferred mode, do nothing.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    public void Defer(Ecs.WorldCallback callback)
+    {
+        ecs_defer_begin(Handle);
+        callback(Handle);
+        ecs_defer_end(Handle);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with id.
+    /// </summary>
+    /// <param name="id">Id to be added to the created entities.</param>
+    /// <param name="callback">The callback.</param>
+    public void With(ulong id, Ecs.WorldCallback callback)
+    {
+        ulong prev = ecs_set_with(Handle, id);
+        callback(Handle);
+        ecs_set_with(Handle, prev);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="first">The first id.</param>
+    /// <param name="second">The second id.</param>
+    /// <param name="callback">The callback.</param>
+    public void With(ulong first, ulong second, Ecs.WorldCallback callback)
+    {
+        With(Ecs.Pair(first, second), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with type.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The component.</typeparam>
+    public void With<T>(Ecs.WorldCallback callback)
+    {
+        With(Type<T>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with enum.
+    /// </summary>
+    /// <param name="value">The enum constant.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="T">The enum.</typeparam>
+    public void With<T>(T value, Ecs.WorldCallback callback) where T : Enum
+    {
+        With<T>(Type<T>.Id(Handle, value), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="second">The second id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first component.</typeparam>
+    public void With<TFirst>(ulong second, Ecs.WorldCallback callback)
+    {
+        With(Ecs.Pair<TFirst>(second, Handle), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first component.</typeparam>
+    /// <typeparam name="TSecond">The second component.</typeparam>
+    public void With<TFirst, TSecond>(Ecs.WorldCallback callback)
+    {
+        With(Ecs.Pair<TFirst, TSecond>(Handle), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="second">The second enum constant id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first component.</typeparam>
+    /// <typeparam name="TSecond">The second enum.</typeparam>
+    public void With<TFirst, TSecond>(TSecond second, Ecs.WorldCallback callback) where TSecond : Enum
+    {
+        With<TFirst>(Type<TSecond>.Id(Handle, second), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="first">The first enum constant.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TFirst">The first enum.</typeparam>
+    /// <typeparam name="TSecond">The second component.</typeparam>
+    public void With<TFirst, TSecond>(TFirst first, Ecs.WorldCallback callback) where TFirst : Enum
+    {
+        WithSecond<TSecond>(Type<TFirst>.Id(Handle, first), callback);
+    }
+
+    /// <summary>
+    ///     All entities created in function are created with pair.
+    /// </summary>
+    /// <param name="first">The first id.</param>
+    /// <param name="callback">The callback.</param>
+    /// <typeparam name="TSecond">The second component.</typeparam>
+    public void WithSecond<TSecond>(ulong first, Ecs.WorldCallback callback)
+    {
+        With(first, Type<TSecond>.Id(Handle), callback);
+    }
+
+    /// <summary>
+    ///     Lookup entity by name.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <returns>The entity if found, else 0.</returns>
+    public Entity Lookup(string path)
+    {
+        return Lookup(path, true);
+    }
+
+    /// <summary>
+    ///     Lookup entity by name.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <returns>The entity if found, else 0.</returns>
+    public Entity Lookup(string path, bool recursive)
+    {
+        if (string.IsNullOrEmpty(path))
+            return new Entity(Handle, 0);
+
+        using NativeString nativePath = (NativeString)path;
+
+        return new Entity(
+            Handle,
+            ecs_lookup_path_w_sep(Handle, 0, nativePath,
+                Pointers.DefaultSeparator, Pointers.DefaultSeparator, recursive)
+        );
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, out Entity entity)
+    {
+        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, true, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, bool recursive, out Entity entity)
+    {
+        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, recursive, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="separator">The separator.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, string separator, out Entity entity)
+    {
+        return TryLookup(path, separator, Ecs.DefaultSeparator, true, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="separator">The separator.</param>
+    /// <param name="rootSeparator">The root separator.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, string separator, string rootSeparator, out Entity entity)
+    {
+        return TryLookup(path, separator, rootSeparator, true, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="separator">The separator.</param>
+    /// <param name="rootSeparator">The root separator.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, string separator, string rootSeparator, bool recursive, out Entity entity)
+    {
+        return (entity = Lookup(path, separator, rootSeparator, recursive)) != 0;
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, out ulong entity)
+    {
+        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, true, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, bool recursive, out ulong entity)
+    {
+        return TryLookup(path, Ecs.DefaultSeparator, Ecs.DefaultSeparator, recursive, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="separator">The separator.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, string separator, out ulong entity)
+    {
+        return TryLookup(path, separator, Ecs.DefaultSeparator, true, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="separator">The separator.</param>
+    /// <param name="rootSeparator">The root separator.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, string separator, string rootSeparator, out ulong entity)
+    {
+        return TryLookup(path, separator, rootSeparator, true, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity from a path.
+    /// </summary>
+    /// <param name="path">The path to resolve.</param>
+    /// <param name="separator">The separator.</param>
+    /// <param name="rootSeparator">The root separator.</param>
+    /// <param name="recursive">Recursively traverse up the tree until entity is found.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookup(string path, string separator, string rootSeparator, bool recursive, out ulong entity)
+    {
+        return (entity = Lookup(path, separator, rootSeparator, recursive)) != 0;
+    }
+
+    /// <summary>
+    ///     Lookup an entity by its symbol name.
+    /// </summary>
+    /// <param name="symbol">The symbol.</param>
+    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
+    /// <param name="recursive">If looking up as path, recursively traverse up the tree.</param>
+    /// <returns>The entity if found, else 0.</returns>
+    public Entity LookupSymbol(string symbol, bool lookupAsPath = false, bool recursive = false)
+    {
+        if (string.IsNullOrEmpty(symbol))
+            return new Entity(Handle, 0);
+
+        using NativeString nativeSymbol = (NativeString)symbol;
+
+        return new Entity(
+            Handle,
+            ecs_lookup_symbol(Handle, nativeSymbol, lookupAsPath, recursive)
+        );
+    }
+
+    /// <summary>
+    ///     Lookup an entity by its symbol name.
+    /// </summary>
+    /// <param name="symbol">The symbol.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookupSymbol(string symbol, out Entity entity)
+    {
+        return TryLookupSymbol(symbol, false, false, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity by its symbol name.
+    /// </summary>
+    /// <param name="symbol">The symbol.</param>
+    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookupSymbol(string symbol, bool lookupAsPath, out Entity entity)
+    {
+        return TryLookupSymbol(symbol, lookupAsPath, false, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity by its symbol name.
+    /// </summary>
+    /// <param name="symbol">The symbol.</param>
+    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
+    /// <param name="recursive">If looking up as path, recursively traverse up the tree.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookupSymbol(string symbol, bool lookupAsPath, bool recursive, out Entity entity)
+    {
+        return (entity = LookupSymbol(symbol, lookupAsPath, recursive)) != 0;
+    }
+
+    /// <summary>
+    ///     Lookup an entity by its symbol name.
+    /// </summary>
+    /// <param name="symbol">The symbol.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookupSymbol(string symbol, out ulong entity)
+    {
+        return TryLookupSymbol(symbol, false, false, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity by its symbol name.
+    /// </summary>
+    /// <param name="symbol">The symbol.</param>
+    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookupSymbol(string symbol, bool lookupAsPath, out ulong entity)
+    {
+        return TryLookupSymbol(symbol, lookupAsPath, false, out entity);
+    }
+
+    /// <summary>
+    ///     Lookup an entity by its symbol name.
+    /// </summary>
+    /// <param name="symbol">The symbol.</param>
+    /// <param name="lookupAsPath">If not found as a symbol, lookup as path.</param>
+    /// <param name="recursive">If looking up as path, recursively traverse up the tree.</param>
+    /// <param name="entity">The entity if found, else 0.</param>
+    /// <returns>True if the entity was found, else false.</returns>
+    public bool TryLookupSymbol(string symbol, bool lookupAsPath, bool recursive, out ulong entity)
+    {
+        return (entity = LookupSymbol(symbol, lookupAsPath, recursive)) != 0;
+    }
+
+    /// <summary>
+    ///     Cleanup empty tables.
+    /// </summary>
+    /// <param name="desc">The description object.</param>
+    /// <returns>The number of deleted tables.</returns>
+    public int DeleteEmptyTables(in DeleteEmptyTablesDesc desc)
+    {
+        fixed (ecs_delete_empty_tables_desc_t* ptr = &desc.Desc)
+            return ecs_delete_empty_tables(Handle, ptr);
+    }
+}
diff --git a/src/Flecs.NET/Generated/AlertBuilder/AlertBuilder.QueryBuilder.g.cs b/src/Flecs.NET/Generated/AlertBuilder/AlertBuilder.QueryBuilder.g.cs
index 68d93820..2e1ddb07 100644
--- a/src/Flecs.NET/Generated/AlertBuilder/AlertBuilder.QueryBuilder.g.cs
+++ b/src/Flecs.NET/Generated/AlertBuilder/AlertBuilder.QueryBuilder.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/AlertBuilder/AlertBuilder.QueryBuilder.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/AlertBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct AlertBuilder
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref AlertBuilder Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref AlertBuilder Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref AlertBuilder Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref AlertBuilder Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref AlertBuilder Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref AlertBuilder Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref AlertBuilder Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref AlertBuilder First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref AlertBuilder Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref AlertBuilder Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref AlertBuilder Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref AlertBuilder Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref AlertBuilder Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref AlertBuilder First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref AlertBuilder First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref AlertBuilder First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref AlertBuilder First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref AlertBuilder Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref AlertBuilder Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref AlertBuilder Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref AlertBuilder Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref AlertBuilder Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref AlertBuilder Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref AlertBuilder Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref AlertBuilder Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref AlertBuilder Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref AlertBuilder Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref AlertBuilder Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref AlertBuilder Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref AlertBuilder Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref AlertBuilder Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref AlertBuilder Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref AlertBuilder Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref AlertBuilder InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref AlertBuilder InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref AlertBuilder Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref AlertBuilder Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref AlertBuilder ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref AlertBuilder In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref AlertBuilder Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref AlertBuilder InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref AlertBuilder InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref AlertBuilder Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref AlertBuilder And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref AlertBuilder Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref AlertBuilder Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref AlertBuilder Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref AlertBuilder AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref AlertBuilder OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref AlertBuilder NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref AlertBuilder Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref AlertBuilder Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref AlertBuilder QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref AlertBuilder CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref AlertBuilder Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref AlertBuilder Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref AlertBuilder With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref AlertBuilder With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref AlertBuilder With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref AlertBuilder With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref AlertBuilder With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref AlertBuilder With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref AlertBuilder With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref AlertBuilder With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref AlertBuilder With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref AlertBuilder With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref AlertBuilder With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref AlertBuilder With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref AlertBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref AlertBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref AlertBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref AlertBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref AlertBuilder WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref AlertBuilder WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref AlertBuilder Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref AlertBuilder Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref AlertBuilder Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref AlertBuilder Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref AlertBuilder Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref AlertBuilder Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref AlertBuilder Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref AlertBuilder Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref AlertBuilder Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref AlertBuilder Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref AlertBuilder Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref AlertBuilder Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref AlertBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref AlertBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref AlertBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref AlertBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref AlertBuilder WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref AlertBuilder WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref AlertBuilder Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref AlertBuilder Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref AlertBuilder Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref AlertBuilder Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref AlertBuilder Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref AlertBuilder Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref AlertBuilder Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref AlertBuilder Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref AlertBuilder Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref AlertBuilder Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref AlertBuilder Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref AlertBuilder Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref AlertBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref AlertBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref AlertBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref AlertBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref AlertBuilder WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref AlertBuilder WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref AlertBuilder Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref AlertBuilder Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref AlertBuilder Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref AlertBuilder Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref AlertBuilder Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref AlertBuilder Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref AlertBuilder Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref AlertBuilder Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref AlertBuilder Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref AlertBuilder Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref AlertBuilder Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref AlertBuilder Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref AlertBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref AlertBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref AlertBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref AlertBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref AlertBuilder ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref AlertBuilder ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref AlertBuilder ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref AlertBuilder ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref AlertBuilder Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref AlertBuilder TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref AlertBuilder TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref AlertBuilder TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref AlertBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref AlertBuilder OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref AlertBuilder GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref AlertBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref AlertBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref AlertBuilder GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref AlertBuilder GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref AlertBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref AlertBuilder GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref AlertBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref AlertBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref AlertBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref AlertBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref AlertBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref AlertBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/AlertBuilder/AlertBuilder.QueryBuilder.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/AlertBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct AlertBuilder
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref AlertBuilder Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref AlertBuilder Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref AlertBuilder Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref AlertBuilder Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref AlertBuilder Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref AlertBuilder Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref AlertBuilder Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref AlertBuilder First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref AlertBuilder Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref AlertBuilder Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref AlertBuilder Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref AlertBuilder Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref AlertBuilder Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref AlertBuilder First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref AlertBuilder First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref AlertBuilder First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref AlertBuilder First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref AlertBuilder Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref AlertBuilder Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref AlertBuilder Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref AlertBuilder Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref AlertBuilder Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref AlertBuilder Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref AlertBuilder Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref AlertBuilder Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref AlertBuilder Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref AlertBuilder Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref AlertBuilder Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref AlertBuilder Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref AlertBuilder Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref AlertBuilder Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref AlertBuilder Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref AlertBuilder Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref AlertBuilder InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref AlertBuilder InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref AlertBuilder Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref AlertBuilder Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref AlertBuilder ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref AlertBuilder In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref AlertBuilder Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref AlertBuilder InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref AlertBuilder InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref AlertBuilder Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref AlertBuilder And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref AlertBuilder Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref AlertBuilder Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref AlertBuilder Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref AlertBuilder AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref AlertBuilder OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref AlertBuilder NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref AlertBuilder Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref AlertBuilder Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref AlertBuilder QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref AlertBuilder CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref AlertBuilder Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref AlertBuilder Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref AlertBuilder With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref AlertBuilder With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref AlertBuilder With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref AlertBuilder With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref AlertBuilder With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref AlertBuilder With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref AlertBuilder With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref AlertBuilder With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref AlertBuilder With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref AlertBuilder With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref AlertBuilder With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref AlertBuilder With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref AlertBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref AlertBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref AlertBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref AlertBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref AlertBuilder WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref AlertBuilder WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref AlertBuilder Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref AlertBuilder Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref AlertBuilder Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref AlertBuilder Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref AlertBuilder Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref AlertBuilder Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref AlertBuilder Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref AlertBuilder Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref AlertBuilder Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref AlertBuilder Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref AlertBuilder Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref AlertBuilder Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref AlertBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref AlertBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref AlertBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref AlertBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref AlertBuilder WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref AlertBuilder WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref AlertBuilder Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref AlertBuilder Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref AlertBuilder Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref AlertBuilder Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref AlertBuilder Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref AlertBuilder Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref AlertBuilder Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref AlertBuilder Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref AlertBuilder Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref AlertBuilder Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref AlertBuilder Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref AlertBuilder Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref AlertBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref AlertBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref AlertBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref AlertBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref AlertBuilder WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref AlertBuilder WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref AlertBuilder Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref AlertBuilder Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref AlertBuilder Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref AlertBuilder Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref AlertBuilder Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref AlertBuilder Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref AlertBuilder Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref AlertBuilder Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref AlertBuilder Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref AlertBuilder Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref AlertBuilder Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref AlertBuilder Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref AlertBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref AlertBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref AlertBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref AlertBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref AlertBuilder ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref AlertBuilder ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref AlertBuilder ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref AlertBuilder ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref AlertBuilder Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref AlertBuilder TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref AlertBuilder TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref AlertBuilder TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref AlertBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref AlertBuilder OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref AlertBuilder GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref AlertBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref AlertBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref AlertBuilder GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref AlertBuilder GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref AlertBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref AlertBuilder GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref AlertBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref AlertBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref AlertBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref AlertBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref AlertBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref AlertBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref AlertBuilder DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder.g.cs
index 9218d10f..9c96cd67 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T1.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T1.g.cs
index 2671abfd..c552fd2e 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T1.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T1.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T1.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T1.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T10.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T10.g.cs
index a634c33d..3c9b2c23 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T10.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T10.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T10.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T10.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T11.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T11.g.cs
index 8a02a553..11c01db3 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T11.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T11.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T11.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T11.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T12.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T12.g.cs
index 9f6bb046..9f6e045e 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T12.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T12.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T12.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T12.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T13.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T13.g.cs
index 7e5124a4..3b32f3be 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T13.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T13.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T13.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T13.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T14.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T14.g.cs
index 2b6cb231..9938f107 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T14.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T14.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T14.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T14.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T15.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T15.g.cs
index 9e20362b..e7cf706c 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T15.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T15.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T15.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T15.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T16.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T16.g.cs
index e354d9d5..e210a071 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T16.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T16.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T16.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T16.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T2.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T2.g.cs
index 9082adc2..5089a2d0 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T2.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T2.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T2.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T2.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T3.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T3.g.cs
index c33f4d03..7c342199 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T3.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T3.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T3.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T3.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T4.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T4.g.cs
index 94e7eb4a..bc80d215 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T4.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T4.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T4.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T4.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T5.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T5.g.cs
index 1b342a45..6b40ca3f 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T5.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T5.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T5.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T5.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T6.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T6.g.cs
index bf08eb9b..95bf6cc3 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T6.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T6.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T6.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T6.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T7.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T7.g.cs
index d29b6f21..77b8e370 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T7.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T7.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T7.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T7.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T8.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T8.g.cs
index 28d1c17c..ce7a5540 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T8.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T8.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T8.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T8.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T9.g.cs b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T9.g.cs
index c5dc405a..c33d263f 100644
--- a/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T9.g.cs
+++ b/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T9.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T9.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/ObserverBuilder/ObserverBuilder.QueryBuilder/T9.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/ObserverBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref ObserverBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder.g.cs
index 06e307c8..9b428042 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T1.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T1.g.cs
index 0f4ae61b..05020c3c 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T1.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T1.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T1.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T1.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T10.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T10.g.cs
index c1350675..619a050e 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T10.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T10.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T10.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T10.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T11.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T11.g.cs
index 209309bb..eea6f24c 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T11.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T11.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T11.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T11.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T12.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T12.g.cs
index 56c6c3e1..b49b2083 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T12.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T12.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T12.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T12.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T13.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T13.g.cs
index b61a22ec..e617c581 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T13.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T13.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T13.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T13.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T14.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T14.g.cs
index ac79d6d7..f34e6e2a 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T14.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T14.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T14.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T14.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T15.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T15.g.cs
index 55fda64a..688fdd48 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T15.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T15.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T15.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T15.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T16.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T16.g.cs
index cda9a6bc..7ef7ea6f 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T16.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T16.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T16.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T16.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T2.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T2.g.cs
index bbc12b08..15fc429b 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T2.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T2.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T2.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T2.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T3.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T3.g.cs
index 8b02a8c6..c4d4afd2 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T3.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T3.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T3.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T3.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T4.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T4.g.cs
index 4e8f2df2..2b3a0862 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T4.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T4.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T4.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T4.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T5.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T5.g.cs
index c05c6195..39ac42b8 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T5.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T5.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T5.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T5.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T6.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T6.g.cs
index 66271953..f11a9762 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T6.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T6.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T6.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T6.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T7.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T7.g.cs
index 2bbb7fb3..fae7eab8 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T7.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T7.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T7.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T7.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T8.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T8.g.cs
index 305ab2f2..ecd17526 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T8.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T8.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T8.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T8.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T9.g.cs b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T9.g.cs
index e4817e36..649f0a25 100644
--- a/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T9.g.cs
+++ b/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T9.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T9.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/PipelineBuilder/PipelineBuilder.QueryBuilder/T9.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/PipelineBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref PipelineBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T1.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T1.g.cs
index a8f705cd..3d9df129 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T1.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T1.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T1.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T1.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T10.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T10.g.cs
index 84acc582..25ba016b 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T10.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T10.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T10.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T10.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T11.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T11.g.cs
index e14eb3e1..aa76331a 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T11.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T11.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T11.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T11.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T12.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T12.g.cs
index bf8446c1..8d3a24ae 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T12.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T12.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T12.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T12.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T13.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T13.g.cs
index daa2fc5d..9cf25131 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T13.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T13.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T13.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T13.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T14.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T14.g.cs
index 67fb32ae..ee041309 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T14.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T14.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T14.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T14.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T15.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T15.g.cs
index 5b33fa8d..f059ed36 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T15.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T15.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T15.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T15.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T16.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T16.g.cs
index 49f4beb4..007d06ed 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T16.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T16.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T16.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T16.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T2.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T2.g.cs
index ef7a2913..b330975f 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T2.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T2.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T2.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T2.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T3.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T3.g.cs
index 0cb89e74..177cef36 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T3.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T3.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T3.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T3.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T4.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T4.g.cs
index 6a4461ac..2df89ddb 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T4.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T4.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T4.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T4.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T5.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T5.g.cs
index 0256cab3..1ec95bf8 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T5.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T5.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T5.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T5.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T6.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T6.g.cs
index f31ccac9..28b72130 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T6.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T6.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T6.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T6.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T7.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T7.g.cs
index c248e80d..825e32df 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T7.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T7.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T7.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T7.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T8.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T8.g.cs
index af4e3e3f..7d3ae4aa 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T8.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T8.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T8.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T8.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T9.g.cs b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T9.g.cs
index df88910a..9f95d6b1 100644
--- a/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T9.g.cs
+++ b/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T9.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T9.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/QueryBuilder/QueryBuilder.QueryBuilder/T9.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/QueryBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref QueryBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder.g.cs
index 152e6c14..b8c391d4 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T1.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T1.g.cs
index 1bfc5d41..bb1ab914 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T1.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T1.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T1.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T1.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T10.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T10.g.cs
index 2cce32eb..f5fc1503 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T10.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T10.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T10.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T10.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T11.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T11.g.cs
index 52689eb1..81e066f7 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T11.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T11.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T11.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T11.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T12.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T12.g.cs
index 16b3a2a2..b83b283e 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T12.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T12.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T12.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T12.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T13.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T13.g.cs
index 7fc48d5f..fad7038d 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T13.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T13.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T13.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T13.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T14.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T14.g.cs
index 85bf676b..70a7e5df 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T14.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T14.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T14.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T14.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T15.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T15.g.cs
index dd3a3a8e..199c8c44 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T15.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T15.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T15.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T15.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T16.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T16.g.cs
index b9afa86c..a06dd9c5 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T16.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T16.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T16.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T16.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T2.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T2.g.cs
index b63203a4..49016f22 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T2.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T2.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T2.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T2.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T3.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T3.g.cs
index ee42115e..455df56a 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T3.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T3.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T3.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T3.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T4.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T4.g.cs
index bf296278..3480ebcd 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T4.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T4.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T4.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T4.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T5.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T5.g.cs
index cfbade5a..2d5f15c3 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T5.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T5.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T5.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T5.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T6.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T6.g.cs
index 67d90b96..a1f2376a 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T6.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T6.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T6.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T6.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T7.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T7.g.cs
index f26e51b5..ea75ccd4 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T7.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T7.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T7.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T7.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T8.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T8.g.cs
index accf9101..99da14cf 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T8.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T8.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T8.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T8.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T9.g.cs b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T9.g.cs
index ebcbb56a..5c38bd41 100644
--- a/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T9.g.cs
+++ b/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T9.g.cs
@@ -1,1052 +1,1058 @@
-// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T9.g.cs
-// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
-using System;
-using static Flecs.NET.Bindings.flecs;
-
-namespace Flecs.NET.Core;
-
-public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
-{
-    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
-    {
-        Ecs.GetQueryBuilder(ref this).Self();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Id(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
-    {
-        Ecs.GetQueryBuilder(ref this).Entity(entity);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Name(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Var(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Term(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
-    {
-        Ecs.GetQueryBuilder(ref this).Src();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
-    {
-        Ecs.GetQueryBuilder(ref this).First();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
-    {
-        Ecs.GetQueryBuilder(ref this).Second();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(srcId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Src<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Src(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Src(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
-    {
-        Ecs.GetQueryBuilder(ref this).First(firstId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).First<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).First(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).First(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondId);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Second<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Second(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
-    {
-        Ecs.GetQueryBuilder(ref this).Second(secondName);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Up(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Up<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Up(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Cascade(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
-    {
-        Ecs.GetQueryBuilder(ref this).Descend();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
-    {
-        Ecs.GetQueryBuilder(ref this).Parent();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
-    {
-        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
-    {
-        Ecs.GetQueryBuilder(ref this).Flags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOut(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
-    {
-        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
-    {
-        Ecs.GetQueryBuilder(ref this).Write();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
-    {
-        Ecs.GetQueryBuilder(ref this).Read();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
-    {
-        Ecs.GetQueryBuilder(ref this).ReadWrite();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
-    {
-        Ecs.GetQueryBuilder(ref this).In();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
-    {
-        Ecs.GetQueryBuilder(ref this).Out();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
-    {
-        Ecs.GetQueryBuilder(ref this).InOut();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
-    {
-        Ecs.GetQueryBuilder(ref this).InOutNone();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
-    {
-        Ecs.GetQueryBuilder(ref this).Oper(oper);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
-    {
-        Ecs.GetQueryBuilder(ref this).And();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
-    {
-        Ecs.GetQueryBuilder(ref this).Or();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
-    {
-        Ecs.GetQueryBuilder(ref this).Not();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
-    {
-        Ecs.GetQueryBuilder(ref this).Optional();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).AndFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).OrFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
-    {
-        Ecs.GetQueryBuilder(ref this).NotFrom();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
-    {
-        Ecs.GetQueryBuilder(ref this).Singleton();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
-    {
-        Ecs.GetQueryBuilder(ref this).Filter();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
-    {
-        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
-    {
-        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
-    {
-        Ecs.GetQueryBuilder(ref this).Cached();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
-    {
-        Ecs.GetQueryBuilder(ref this).Expr(expr);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).With(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).With(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).With(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).With(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Without(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Write(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(term);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(id);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(name);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(value);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
-    {
-        Ecs.GetQueryBuilder(ref this).Read(first, second);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
-    {
-        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeOpen();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
-    {
-        Ecs.GetQueryBuilder(ref this).ScopeClose();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
-    {
-        Ecs.GetQueryBuilder(ref this).Term();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
-    {
-        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
-        return ref this;
-    }
-
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
-    
-    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
-    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
-    {
-        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
-        return ref this;
-    }
+// /_/src/Flecs.NET/Generated/SystemBuilder/SystemBuilder.QueryBuilder/T9.g.cs
+// File was auto-generated by /_/src/Flecs.NET.Codegen/Generators/SystemBuilder.cs
+using System;
+using static Flecs.NET.Bindings.flecs;
+
+namespace Flecs.NET.Core;
+
+public unsafe partial struct SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8>
+{
+    /// <inheritdoc cref="Core.QueryBuilder.Self()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Self()
+    {
+        Ecs.GetQueryBuilder(ref this).Self();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Id(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Id(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Id(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Entity(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Entity(ulong entity)
+    {
+        Ecs.GetQueryBuilder(ref this).Entity(entity);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Name(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Name(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Name(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Var(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Var(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Var(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Term(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src()
+    {
+        Ecs.GetQueryBuilder(ref this).Src();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First()
+    {
+        Ecs.GetQueryBuilder(ref this).First();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second()
+    {
+        Ecs.GetQueryBuilder(ref this).Second();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(ulong srcId)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(srcId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Src<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Src(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Src(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Src(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Src(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(ulong firstId)
+    {
+        Ecs.GetQueryBuilder(ref this).First(firstId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).First<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).First(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.First(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> First(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).First(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(ulong secondId)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondId);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Second<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Second(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Second(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Second(string secondName)
+    {
+        Ecs.GetQueryBuilder(ref this).Second(secondName);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Up(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Up<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Up{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Up<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Up(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade(ulong traverse = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(traverse);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cascade{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cascade<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Cascade(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Descend()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Descend()
+    {
+        Ecs.GetQueryBuilder(ref this).Descend();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Parent()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Parent()
+    {
+        Ecs.GetQueryBuilder(ref this).Parent();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav(ulong, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav(ulong traverse, uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(traverse, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(uint flags = 0)
+    {
+        Ecs.GetQueryBuilder(ref this).Trav<T>(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Trav{T}(T, uint)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Trav<T>(T value, uint flags = 0) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Trav(value, flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Flags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Flags(ulong flags)
+    {
+        Ecs.GetQueryBuilder(ref this).Flags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOut(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutStage(ecs_inout_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutStage(ecs_inout_kind_t inOut)
+    {
+        Ecs.GetQueryBuilder(ref this).InOutStage(inOut);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write()
+    {
+        Ecs.GetQueryBuilder(ref this).Write();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read()
+    {
+        Ecs.GetQueryBuilder(ref this).Read();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadWrite()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadWrite()
+    {
+        Ecs.GetQueryBuilder(ref this).ReadWrite();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.In()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> In()
+    {
+        Ecs.GetQueryBuilder(ref this).In();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Out()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Out()
+    {
+        Ecs.GetQueryBuilder(ref this).Out();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOut()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOut()
+    {
+        Ecs.GetQueryBuilder(ref this).InOut();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.InOutNone()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> InOutNone()
+    {
+        Ecs.GetQueryBuilder(ref this).InOutNone();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Oper(ecs_oper_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Oper(ecs_oper_kind_t oper)
+    {
+        Ecs.GetQueryBuilder(ref this).Oper(oper);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.And()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> And()
+    {
+        Ecs.GetQueryBuilder(ref this).And();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Or()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Or()
+    {
+        Ecs.GetQueryBuilder(ref this).Or();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Not()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Not()
+    {
+        Ecs.GetQueryBuilder(ref this).Not();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Optional()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Optional()
+    {
+        Ecs.GetQueryBuilder(ref this).Optional();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.AndFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> AndFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).AndFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).OrFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.NotFrom()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> NotFrom()
+    {
+        Ecs.GetQueryBuilder(ref this).NotFrom();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Singleton()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Singleton()
+    {
+        Ecs.GetQueryBuilder(ref this).Singleton();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Filter()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Filter()
+    {
+        Ecs.GetQueryBuilder(ref this).Filter();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.QueryFlags"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> QueryFlags(uint flags)
+    {
+        Ecs.GetQueryBuilder(ref this).QueryFlags(flags);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.CacheKind(ecs_query_cache_kind_t)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> CacheKind(ecs_query_cache_kind_t kind)
+    {
+        Ecs.GetQueryBuilder(ref this).CacheKind(kind);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Cached()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Cached()
+    {
+        Ecs.GetQueryBuilder(ref this).Cached();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Expr(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Expr(string expr)
+    {
+        Ecs.GetQueryBuilder(ref this).Expr(expr);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).With(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).With(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).With(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.With{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> With<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).With(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Without{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Without<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Without(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WithoutSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WithoutSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WithoutSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Write{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Write<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Write(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.WriteSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> WriteSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).WriteSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(Core.Term)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(Term term)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(term);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong id)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(id);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string name)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(name);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(ulong, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(ulong first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read(string, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read(string first, string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<T>(T value) where T : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(value);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(ulong second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(string second)
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>()
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1, T2}(T1)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst, TSecond>(TFirst first) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read<TFirst, TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T1}(T1, string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TFirst>(TFirst first, string second) where TFirst : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Read{T2}(string, T2)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Read<TSecond>(string first, TSecond second) where TSecond : Enum
+    {
+        Ecs.GetQueryBuilder(ref this).Read(first, second);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(ulong first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ReadSecond{T2}(string)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ReadSecond<TSecond>(string first)
+    {
+        Ecs.GetQueryBuilder(ref this).ReadSecond<TSecond>(first);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeOpen()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeOpen()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeOpen();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.ScopeClose()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> ScopeClose()
+    {
+        Ecs.GetQueryBuilder(ref this).ScopeClose();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.Term()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> Term()
+    {
+        Ecs.GetQueryBuilder(ref this).Term();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.TermAt{T}(int)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> TermAt<T>(int termIndex)
+    {
+        Ecs.GetQueryBuilder(ref this).TermAt<T>(termIndex);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy(ulong, Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy(ulong component, Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OrderBy{T}(Ecs.OrderByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OrderBy<T>(Ecs.OrderByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OrderBy<T>(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy(ulong, Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy(ulong component, Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{TContext}(ulong, Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<TContext>(ulong component, Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy(component, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}()"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>()
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>();
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T}(Ecs.GroupByCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T>(Ecs.GroupByCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupBy{T, TContext}(Ecs.GroupByCallback{TContext})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupBy<T, TContext>(Ecs.GroupByCallback<TContext> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupBy<T, TContext>(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, Ecs.UserContextFinish<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.GroupByCtx{T}(T, Ecs.UserContextFinish{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> GroupByCtx<T>(T value, delegate*<ref T, void> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).GroupByCtx(value, callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate(Ecs.GroupCreateCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate(Ecs.GroupCreateCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupCreate{T}(Ecs.GroupCreateCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupCreate<T>(Ecs.GroupCreateCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupCreate(callback);
+        return ref this;
+    }
+
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete(Ecs.GroupDeleteCallback)"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete(Ecs.GroupDeleteCallback callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    /// <inheritdoc cref="Core.QueryBuilder.OnGroupDelete{T}(Ecs.GroupDeleteCallback{T})"/>
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> OnGroupDelete<T>(Ecs.GroupDeleteCallback<T> callback)
+    {
+        Ecs.GetQueryBuilder(ref this).OnGroupDelete(callback);
+        return ref this;
+    }
+    
+    public ref SystemBuilder<T0, T1, T2, T3, T4, T5, T6, T7, T8> DetectChanges()
+    {
+        Ecs.GetQueryBuilder(ref this).DetectChanges();
+        return ref this;
+    }
 }
\ No newline at end of file
diff --git a/src/Flecs.NET/Utilities/Managed.cs b/src/Flecs.NET/Utilities/Managed.cs
index d2492a18..87179073 100644
--- a/src/Flecs.NET/Utilities/Managed.cs
+++ b/src/Flecs.NET/Utilities/Managed.cs
@@ -1,83 +1,101 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Flecs.NET.Core.BindingContext;
-
-namespace Flecs.NET.Utilities;
-
-/// <summary>
-///     Static class for working with managed memory in flecs.
-/// </summary>
-public static unsafe class Managed
-{
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static void AllocGcHandle<T>(T* comp, out GCHandle handle)
-    {
-        handle = GCHandle.Alloc(new StrongBox<T>(*comp));
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static void FreeGcHandle(IntPtr handle)
-    {
-        if (handle != IntPtr.Zero)
-            GCHandle.FromIntPtr(handle).Free();
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static void FreeGcHandle(GCHandle handle)
-    {
-        if ((IntPtr)handle != IntPtr.Zero)
-            handle.Free();
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static void FreeGcHandle(void* data, int index = 0)
-    {
-        IntPtr handle = ((IntPtr*)data)[index];
-        FreeGcHandle(handle);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static ref T GetTypeRef<T>(void* data)
-    {
-        if (!RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-            return ref Unsafe.AsRef<T>(data);
-
-        GCHandle handle = GCHandle.FromIntPtr(*(IntPtr*)data);
-        StrongBox<T> box = (StrongBox<T>)handle.Target!;
-        return ref box.Value!;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static ref T GetTypeRef<T>(void* data, int index)
-    {
-        if (data == null)
-            return ref Unsafe.NullRef<T>();
-
-        if (!RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-            return ref ((T*)data)[index];
-
-        GCHandle handle = GCHandle.FromIntPtr(((IntPtr*)data)[index]);
-        StrongBox<T> box = (StrongBox<T>)handle.Target!;
-        return ref box.Value!;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static ref T GetTypeRef<T>(IntPtr data)
-    {
-        return ref GetTypeRef<T>((void*)data);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static ref T GetTypeRef<T>(IntPtr data, int index)
-    {
-        return ref GetTypeRef<T>((void*)data, index);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static ref T GetTypeRef<T>(GCHandle handle)
-    {
-        StrongBox<T> box = (StrongBox<T>)handle.Target!;
-        return ref box.Value!;
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Flecs.NET.Core.BindingContext;
+
+namespace Flecs.NET.Utilities;
+
+/// <summary>
+///     Static class for working with managed memory in flecs.
+/// </summary>
+public static unsafe class Managed
+{
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static void AllocGcHandle<T>(T* comp, out GCHandle handle)
+    {
+        handle = GCHandle.Alloc(new StrongBox<T>(*comp));
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static void FreeGcHandle(IntPtr handle)
+    {
+        if (handle != IntPtr.Zero)
+            GCHandle.FromIntPtr(handle).Free();
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static void FreeGcHandle(GCHandle handle)
+    {
+        if ((IntPtr)handle != IntPtr.Zero)
+            handle.Free();
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static void FreeGcHandle(void* data, int index = 0)
+    {
+        IntPtr handle = ((IntPtr*)data)[index];
+        FreeGcHandle(handle);
+    }
+
+    private static readonly Dictionary<Type, bool> TypeIsRefy = new();
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static object Get(Type type, void* data)
+    {
+        if (!TypeIsRefy.TryGetValue(type, out bool refy))
+        {
+            TypeIsRefy.Add(type, refy = (bool) typeof(RuntimeHelpers).GetMethod(nameof(RuntimeHelpers.IsReferenceOrContainsReferences))!.MakeGenericMethod(type).Invoke(null, [])!);
+        }
+
+        if (refy)
+            return Unsafe.AsRef<object>(data);
+
+        GCHandle handle = GCHandle.FromIntPtr(*(IntPtr*)data);
+        IStrongBox box = (IStrongBox)handle.Target!;
+        return box.Value!;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static ref T GetTypeRef<T>(void* data)
+    {
+        if (!RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+            return ref Unsafe.AsRef<T>(data);
+
+        GCHandle handle = GCHandle.FromIntPtr(*(IntPtr*)data);
+        StrongBox<T> box = (StrongBox<T>)handle.Target!;
+        return ref box.Value!;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static ref T GetTypeRef<T>(void* data, int index)
+    {
+        if (data == null)
+            return ref Unsafe.NullRef<T>();
+
+        if (!RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+            return ref ((T*)data)[index];
+
+        GCHandle handle = GCHandle.FromIntPtr(((IntPtr*)data)[index]);
+        StrongBox<T> box = (StrongBox<T>)handle.Target!;
+        return ref box.Value!;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static ref T GetTypeRef<T>(IntPtr data)
+    {
+        return ref GetTypeRef<T>((void*)data);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static ref T GetTypeRef<T>(IntPtr data, int index)
+    {
+        return ref GetTypeRef<T>((void*)data, index);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static ref T GetTypeRef<T>(GCHandle handle)
+    {
+        StrongBox<T> box = (StrongBox<T>)handle.Target!;
+        return ref box.Value!;
+    }
+}