Align docs

2025-01-21 23:58:49 -05:00 · 2020-03-02 20:12:38 +01:00 · 2020-03-02 20:12:38 +01:00 · 818c0a259e
commit 818c0a259e
parent b4b8ad0c09
19 changed files with 3165 additions and 2697 deletions
--- a/docs/README.md
+++ b/docs/README.md
@ -9,6 +9,8 @@
 -   API
    -   [UnityAtoms](./api/unityatoms.md)
    -   [UnityAtoms.Editor](./api/unityatoms.editor.md)
+    -   [UnityAtoms.BaseAtoms](./api/unityatoms.baseatoms.md)
+    -   [UnityAtoms.BaseAtoms.Editor](./api/unityatoms.baseatoms.editor.md)
    -   [UnityAtoms.Mobile](./api/unityatoms.mobile.md)
    -   [UnityAtoms.Mobile.Editor](./api/unityatoms.mobile.editor.md)
    -   [UnityAtoms.MonoHooks](./api/unityatoms.monohooks.md)
@ -16,6 +18,7 @@
    -   [UnityAtoms.SceneMgmt.Editor](./api/unityatoms.scenemgmt.editor.md)
    -   [UnityAtoms.Tags](./api/unityatoms.tags.md)
 -   Subpackages
+    -   [BaseAtoms](./subpackages/base-atoms.md)
    -   [Mobile](./subpackages/mobile.md)
    -   [MonoHooks](./subpackages/mono-hooks.md)
    -   [SceneMgmt](./subpackages/scene-mgmt.md)
--- a/docs/api/unityatoms.baseatoms.editor.md
+++ b/docs/api/unityatoms.baseatoms.editor.md
@ -0,0 +1,542 @@
+---
+id: unityatoms.baseatoms.editor
+title: UnityAtoms.BaseAtoms.Editor
+hide_title: true
+sidebar_label: UnityAtoms.BaseAtoms.Editor
+---
+
+# Namespace - `UnityAtoms.BaseAtoms.Editor`
+
+## `VoidEventEditor`
+
+Event property drawer of type `Void`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringVariableEditor`
+
+Variable Inspector of type `string`. Inherits from `AtomVariableEditor`
+
+---
+
+## `IntVariableEditor`
+
+Variable Inspector of type `int`. Inherits from `AtomVariableEditor`
+
+---
+
+## `GameObjectVariableEditor`
+
+Variable Inspector of type `GameObject`. Inherits from `AtomVariableEditor`
+
+---
+
+## `ColliderVariableEditor`
+
+Variable Inspector of type `Collider`. Inherits from `AtomVariableEditor`
+
+---
+
+## `BoolVariableEditor`
+
+Variable Inspector of type `bool`. Inherits from `AtomVariableEditor`
+
+---
+
+## `Vector2VariableEditor`
+
+Variable Inspector of type `Vector2`. Inherits from `AtomVariableEditor`
+
+---
+
+## `Collider2DVariableEditor`
+
+Variable Inspector of type `Collider2D`. Inherits from `AtomVariableEditor`
+
+---
+
+## `Vector3VariableEditor`
+
+Variable Inspector of type `Vector3`. Inherits from `AtomVariableEditor`
+
+---
+
+## `FloatVariableEditor`
+
+Variable Inspector of type `float`. Inherits from `AtomVariableEditor`
+
+---
+
+## `ColorVariableEditor`
+
+Variable Inspector of type `Color`. Inherits from `AtomVariableEditor`
+
+---
+
+## `BoolEventEditor`
+
+Event property drawer of type `bool`. Inherits from `AtomEventEditor<bool, BoolEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColorPairEventEditor`
+
+Event property drawer of type `ColorPair`. Inherits from `AtomEventEditor<ColorPair, ColorPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderEventEditor`
+
+Event property drawer of type `Collider`. Inherits from `AtomEventEditor<Collider, ColliderEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `IntPairEventEditor`
+
+Event property drawer of type `IntPair`. Inherits from `AtomEventEditor<IntPair, IntPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColorEventEditor`
+
+Event property drawer of type `Color`. Inherits from `AtomEventEditor<Color, ColorEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector2EventEditor`
+
+Event property drawer of type `Vector2`. Inherits from `AtomEventEditor<Vector2, Vector2Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `IntEventEditor`
+
+Event property drawer of type `int`. Inherits from `AtomEventEditor<int, IntEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `BoolPairEventEditor`
+
+Event property drawer of type `BoolPair`. Inherits from `AtomEventEditor<BoolPair, BoolPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DEventEditor`
+
+Event property drawer of type `Collider2D`. Inherits from `AtomEventEditor<Collider2D, Collider2DEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `FloatPairEventEditor`
+
+Event property drawer of type `FloatPair`. Inherits from `AtomEventEditor<FloatPair, FloatPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector2PairEventEditor`
+
+Event property drawer of type `Vector2Pair`. Inherits from `AtomEventEditor<Vector2Pair, Vector2PairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DPairEventEditor`
+
+Event property drawer of type `Collider2DPair`. Inherits from `AtomEventEditor<Collider2DPair, Collider2DPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `AtomBaseVariableEventEditor`
+
+Event property drawer of type `AtomBaseVariable`. Inherits from `AtomEventEditor<AtomBaseVariable, AtomBaseVariableEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector3PairEventEditor`
+
+Event property drawer of type `Vector3Pair`. Inherits from `AtomEventEditor<Vector3Pair, Vector3PairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `FloatEventEditor`
+
+Event property drawer of type `float`. Inherits from `AtomEventEditor<float, FloatEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringEventEditor`
+
+Event property drawer of type `string`. Inherits from `AtomEventEditor<string, StringEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `GameObjectPairEventEditor`
+
+Event property drawer of type `GameObjectPair`. Inherits from `AtomEventEditor<GameObjectPair, GameObjectPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `GameObjectEventEditor`
+
+Event property drawer of type `GameObject`. Inherits from `AtomEventEditor<GameObject, GameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderPairEventEditor`
+
+Event property drawer of type `ColliderPair`. Inherits from `AtomEventEditor<ColliderPair, ColliderPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector3EventEditor`
+
+Event property drawer of type `Vector3`. Inherits from `AtomEventEditor<Vector3, Vector3Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringPairEventEditor`
+
+Event property drawer of type `StringPair`. Inherits from `AtomEventEditor<StringPair, StringPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DConstantDrawer`
+
+Constant property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector2ConstantDrawer`
+
+Constant property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2Constant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `FloatConstantDrawer`
+
+Constant property drawer of type `float`. Inherits from `AtomDrawer<FloatConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector3ConstantDrawer`
+
+Constant property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3Constant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColorConstantDrawer`
+
+Constant property drawer of type `Color`. Inherits from `AtomDrawer<ColorConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringConstantDrawer`
+
+Constant property drawer of type `string`. Inherits from `AtomDrawer<StringConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `IntConstantDrawer`
+
+Constant property drawer of type `int`. Inherits from `AtomDrawer<IntConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `GameObjectConstantDrawer`
+
+Constant property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderConstantDrawer`
+
+Constant property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `BoolConstantDrawer`
+
+Constant property drawer of type `bool`. Inherits from `AtomDrawer<BoolConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColorVariableDrawer`
+
+Variable property drawer of type `Color`. Inherits from `AtomDrawer<ColorVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector3VariableDrawer`
+
+Variable property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3Variable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `FloatVariableDrawer`
+
+Variable property drawer of type `float`. Inherits from `AtomDrawer<FloatVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector2VariableDrawer`
+
+Variable property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2Variable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DVariableDrawer`
+
+Variable property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `GameObjectVariableDrawer`
+
+Variable property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `BoolVariableDrawer`
+
+Variable property drawer of type `bool`. Inherits from `AtomDrawer<BoolVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderVariableDrawer`
+
+Variable property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `IntVariableDrawer`
+
+Variable property drawer of type `int`. Inherits from `AtomDrawer<IntVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringVariableDrawer`
+
+Variable property drawer of type `string`. Inherits from `AtomDrawer<StringVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringPairEventDrawer`
+
+Event property drawer of type `StringPair`. Inherits from `AtomDrawer<StringPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector3EventDrawer`
+
+Event property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `FloatEventDrawer`
+
+Event property drawer of type `float`. Inherits from `AtomDrawer<FloatEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector3PairEventDrawer`
+
+Event property drawer of type `Vector3Pair`. Inherits from `AtomDrawer<Vector3PairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `GameObjectEventDrawer`
+
+Event property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderPairEventDrawer`
+
+Event property drawer of type `ColliderPair`. Inherits from `AtomDrawer<ColliderPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringEventDrawer`
+
+Event property drawer of type `string`. Inherits from `AtomDrawer<StringEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `GameObjectPairEventDrawer`
+
+Event property drawer of type `GameObjectPair`. Inherits from `AtomDrawer<GameObjectPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `AtomBaseVariableEventDrawer`
+
+Event property drawer of type `AtomBaseVariable`. Inherits from `AtomDrawer<AtomBaseVariableEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector2PairEventDrawer`
+
+Event property drawer of type `Vector2Pair`. Inherits from `AtomDrawer<Vector2PairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DPairEventDrawer`
+
+Event property drawer of type `Collider2DPair`. Inherits from `AtomDrawer<Collider2DPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DEventDrawer`
+
+Event property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `FloatPairEventDrawer`
+
+Event property drawer of type `FloatPair`. Inherits from `AtomDrawer<FloatPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `IntEventDrawer`
+
+Event property drawer of type `int`. Inherits from `AtomDrawer<IntEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `BoolPairEventDrawer`
+
+Event property drawer of type `BoolPair`. Inherits from `AtomDrawer<BoolPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderEventDrawer`
+
+Event property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector2EventDrawer`
+
+Event property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `IntPairEventDrawer`
+
+Event property drawer of type `IntPair`. Inherits from `AtomDrawer<IntPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColorEventDrawer`
+
+Event property drawer of type `Color`. Inherits from `AtomDrawer<ColorEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `BoolEventDrawer`
+
+Event property drawer of type `bool`. Inherits from `AtomDrawer<BoolEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColorPairEventDrawer`
+
+Event property drawer of type `ColorPair`. Inherits from `AtomDrawer<ColorPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `AtomBaseVariableListDrawer`
+
+A custom property drawer for AtomBaseVariableList.
+
+---
+
+## `StringReferenceAtomBaseVariableDictionaryDrawer`
+
+SerializableDictionary property drawer for type <StringReference, AtomBaseVariable>. Inherits from `SerializableDictionaryDrawer<StringReference, AtomBaseVariable, StringReferenceAtomBaseVariableDictionary>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `SerializableDictionaryDrawer`3`
+
+A custom property drawer for SerializableDictionary.
+
+---
+
+## `FloatValueListDrawer`
+
+Value List property drawer of type `float`. Inherits from `AtomDrawer<FloatValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `BoolValueListDrawer`
+
+Value List property drawer of type `bool`. Inherits from `AtomDrawer<BoolValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `IntValueListDrawer`
+
+Value List property drawer of type `int`. Inherits from `AtomDrawer<IntValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColorValueListDrawer`
+
+Value List property drawer of type `Color`. Inherits from `AtomDrawer<ColorValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `StringValueListDrawer`
+
+Value List property drawer of type `string`. Inherits from `AtomDrawer<StringValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector3ValueListDrawer`
+
+Value List property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3ValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `GameObjectValueListDrawer`
+
+Value List property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderValueListDrawer`
+
+Value List property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Vector2ValueListDrawer`
+
+Value List property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2ValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DValueListDrawer`
+
+Value List property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ClampBaseEditor`
+
+Base class for a custom editor for Clamp Functions.
+
+---
+
+## `ClampFloatEditor`
+
+Custom editor for ClampFloat.
+
+---
+
+## `ClampIntEditor`
+
+Custom editor for ClampInt.
+
+---
--- a/docs/api/unityatoms.baseatoms.md
+++ b/docs/api/unityatoms.baseatoms.md
--- a/docs/api/unityatoms.editor.md
+++ b/docs/api/unityatoms.editor.md
@ -113,7 +113,7 @@ Set and display warning text in the editor.
 ##### Parameters

 -   `atomType` - `AtomType` to generate the warning for.
-   `dependencies` - The `AtomType`s that this `AtomType` is depending on.
+-   `disabledDeps` - List of disabled deps.

 ---

@ -147,6 +147,12 @@ A new toggle row (`VisualElement`).

 ---

+## `AtomReceipe`
+
+Internal module class that holds that regarding an Atom type.
+
+---
+
 ## `AtomType`

 Internal module class that holds that regarding an Atom type.
@ -159,13 +165,13 @@ Generator that generates new Atom types based on the input data. Used by the `Ge

 ### Methods

-#### `Generate(System.String,System.String,System.Boolean,System.Collections.Generic.List{UnityAtoms.Editor.AtomType},System.String,System.String)`
+#### `Generate(UnityAtoms.Editor.AtomReceipe,System.String,System.String[],System.Collections.Generic.List{System.String},System.Collections.Generic.Dictionary{System.String,System.String})`

 Generate new Atoms based on the input data.

 ##### Parameters

-   `type` - The type of Atom to generate.abstract Eg. double, byte, MyStruct, MyClass.
+-   `valueType` - The type of Atom to generate.abstract Eg. double, byte, MyStruct, MyClass.
 -   `baseWritePath` - Base write path (relative to the Asset folder) where the Atoms are going to be written to.
 -   `isEquatable` - Is the `type` provided implementing `IEquatable`?
 -   `atomTypesToGenerate` - A list of `AtomType`s to be generated.
@ -195,7 +201,7 @@ Removes duplicate namespaces, given content from a template.

 ##### Parameters

-   `content` - The content template to remove namespace from.
+-   `template` - The content template to remove namespace from.

 ##### Returns

@ -203,72 +209,6 @@ A copy of `content`, but without duplicate namespaces.

 ---

-#### `ResolveFileName(System.Collections.Generic.Dictionary{System.String,System.String},System.String,System.Int32,System.String,System.String,System.Int32)`
-
-Resolve file name based on input data.
-
-##### Parameters
-
-   `templateVariables` - Template variables. 
-   `templateName` - Template name.
-   `lastIndexOfDoubleUnderscore` - Last index of double underscore.
-   `capitalizedType` - Capitalized type.
-   `capitalizedAtomType` - Capitalized Atom type (string).
-   `typeOccurrences` - Number of occurrences of the type.
-
-##### Returns
-
-The filename to use.
-
---
-
-#### `ResolveDirPath(System.String,System.String,System.String,System.String)`
-
-Resolves the directory path based on the input data.
-
-##### Parameters
-
-   `baseWritePath` - The base write path (relative to the Assets folder).
-   `capitalizedAtomType` - Capitalized Atom type (string).
-   `templateName` - Template name.
-   `atomType` - Atom type.
-
-##### Returns
-
-The directory to use.
-
---
-
-#### `Capitalize(System.String)`
-
-Capitalize the provided string.
-
-##### Parameters
-
-   `s` - The string to capitalize.
-
-##### Returns
-
-A capitalized version of the string provided.
-
---
-
-#### `ShouldSkipTemplate(System.Collections.Generic.List{UnityAtoms.Editor.AtomType},System.String,System.Int32)`
-
-Given the input data, should generation of this template be skipped.
-
-##### Parameters
-
-   `atomTypesToGenerate` - List of Atom types to generate.
-   `capitalizedAtomType` - Capitalized Atom type (string).
-   `typeOccurrences` - Number of occurrences of the type.
-
-##### Returns
-
-If we should skip the template or not.
-
---
-
 ## `AtomTypes`

 Internal static class holding predefined static `AtomType`s.
@ -297,102 +237,18 @@ A custom property drawer for References. Makes it possible to choose between a v

 ---

-## `StringVariableEditor`
+## `ReadOnlyDrawer`

-Variable Inspector of type `string`. Inherits from `AtomVariableEditor`
+Make property read only by using the abbtribute `[ReadOnly]`. Solution taken from: https://answers.unity.com/questions/489942/how-to-make-a-readonly-property-in-inspector.html

 ---

-## `IntVariableEditor`
-
-Variable Inspector of type `int`. Inherits from `AtomVariableEditor`
-
---
-
-## `GameObjectVariableEditor`
-
-Variable Inspector of type `GameObject`. Inherits from `AtomVariableEditor`
-
---
-
-## `ColliderVariableEditor`
-
-Variable Inspector of type `Collider`. Inherits from `AtomVariableEditor`
-
---
-
-## `BoolVariableEditor`
-
-Variable Inspector of type `bool`. Inherits from `AtomVariableEditor`
-
---
-
-## `Vector2VariableEditor`
-
-Variable Inspector of type `Vector2`. Inherits from `AtomVariableEditor`
-
---
-
-## `Collider2DVariableEditor`
-
-Variable Inspector of type `Collider2D`. Inherits from `AtomVariableEditor`
-
---
-
-## `Vector3VariableEditor`
-
-Variable Inspector of type `Vector3`. Inherits from `AtomVariableEditor`
-
---
-
-## `AtomVariableEditor`
+## `AtomVariableEditor`2`

 Custom editor for Variables. Provides a better user workflow and indicates when which variables can be edited

 ---

-## `FloatVariableEditor`
-
-Variable Inspector of type `float`. Inherits from `AtomVariableEditor`
-
---
-
-## `ColorVariableEditor`
-
-Variable Inspector of type `Color`. Inherits from `AtomVariableEditor`
-
---
-
-## `BoolEventEditor`
-
-Event property drawer of type `bool`. Inherits from `AtomEventEditor<bool, BoolEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `BoolBoolEventEditor`
-
-Event property drawer of type `<bool, bool>`. Inherits from `AtomEventEditor<bool, bool, BoolEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColliderEventEditor`
-
-Event property drawer of type `Collider`. Inherits from `AtomEventEditor<Collider, ColliderEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColorEventEditor`
-
-Event property drawer of type `Color`. Inherits from `AtomEventEditor<Color, ColorEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector2EventEditor`
-
-Event property drawer of type `Vector2`. Inherits from `AtomEventEditor<Vector2, Vector2Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
 ## `AtomEventEditor<T,E>`

 #### Type Parameters
@ -404,464 +260,8 @@ Custom editor for Events. Adds the possiblity to raise an Event from Unity's Ins

 ---

-## `AtomEventEditor<T1,T2,E>`
-
-#### Type Parameters
-
-   `T1` - The first type of this Event.
-   `T2` - The second type of this Event.
-   `E` - Event of type T1 and T2.
-
-Custom editor for Events. Adds the possiblity to raise an Event from Unity's Inspector.
-
---
-
-## `IntEventEditor`
-
-Event property drawer of type `int`. Inherits from `AtomEventEditor<int, IntEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector3Vector3EventEditor`
-
-Event property drawer of type `<Vector3, Vector3>`. Inherits from `AtomEventEditor<Vector3, Vector3, Vector3Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `GameObjectGameObjectEventEditor`
-
-Event property drawer of type `<GameObject, GameObject>`. Inherits from `AtomEventEditor<GameObject, GameObject, GameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `FloatFloatEventEditor`
-
-Event property drawer of type `<float, float>`. Inherits from `AtomEventEditor<float, float, FloatEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Collider2DEventEditor`
-
-Event property drawer of type `Collider2D`. Inherits from `AtomEventEditor<Collider2D, Collider2DEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `VoidEventEditor`
-
-Event property drawer of type `Void`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `AtomBaseVariableEventEditor`
-
-Event property drawer of type `AtomBaseVariable`. Inherits from `AtomEventEditor<AtomBaseVariable, AtomBaseVariableEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Collider2DCollider2DEventEditor`
-
-Event property drawer of type `<Collider2D, Collider2D>`. Inherits from `AtomEventEditor<Collider2D, Collider2D, Collider2DEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColliderColliderEventEditor`
-
-Event property drawer of type `<Collider, Collider>`. Inherits from `AtomEventEditor<Collider, Collider, ColliderEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `FloatEventEditor`
-
-Event property drawer of type `float`. Inherits from `AtomEventEditor<float, FloatEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringEventEditor`
-
-Event property drawer of type `string`. Inherits from `AtomEventEditor<string, StringEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `GameObjectEventEditor`
-
-Event property drawer of type `GameObject`. Inherits from `AtomEventEditor<GameObject, GameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector3EventEditor`
-
-Event property drawer of type `Vector3`. Inherits from `AtomEventEditor<Vector3, Vector3Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `IntIntEventEditor`
-
-Event property drawer of type `<int, int>`. Inherits from `AtomEventEditor<int, int, IntEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColorColorEventEditor`
-
-Event property drawer of type `<Color, Color>`. Inherits from `AtomEventEditor<Color, Color, ColorEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector2Vector2EventEditor`
-
-Event property drawer of type `<Vector2, Vector2>`. Inherits from `AtomEventEditor<Vector2, Vector2, Vector2Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringStringEventEditor`
-
-Event property drawer of type `<string, string>`. Inherits from `AtomEventEditor<string, string, StringEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Collider2DConstantDrawer`
-
-Constant property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector2ConstantDrawer`
-
-Constant property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2Constant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `FloatConstantDrawer`
-
-Constant property drawer of type `float`. Inherits from `AtomDrawer<FloatConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector3ConstantDrawer`
-
-Constant property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3Constant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColorConstantDrawer`
-
-Constant property drawer of type `Color`. Inherits from `AtomDrawer<ColorConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringConstantDrawer`
-
-Constant property drawer of type `string`. Inherits from `AtomDrawer<StringConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `IntConstantDrawer`
-
-Constant property drawer of type `int`. Inherits from `AtomDrawer<IntConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `GameObjectConstantDrawer`
-
-Constant property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColliderConstantDrawer`
-
-Constant property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `BoolConstantDrawer`
-
-Constant property drawer of type `bool`. Inherits from `AtomDrawer<BoolConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringReferenceAtomBaseVariableDictionaryDrawer`
-
-SerializableDictionary property drawer for type <StringReference, AtomBaseVariable>. Inherits from `SerializableDictionaryDrawer<StringReference, AtomBaseVariable, StringReferenceAtomBaseVariableDictionary>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `SerializableDictionaryDrawer`3`
-
-A custom property drawer for SerializableDictionary.
-
---
-
-## `ColorVariableDrawer`
-
-Variable property drawer of type `Color`. Inherits from `AtomDrawer<ColorVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector3VariableDrawer`
-
-Variable property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3Variable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `FloatVariableDrawer`
-
-Variable property drawer of type `float`. Inherits from `AtomDrawer<FloatVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector2VariableDrawer`
-
-Variable property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2Variable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Collider2DVariableDrawer`
-
-Variable property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `GameObjectVariableDrawer`
-
-Variable property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `BoolVariableDrawer`
-
-Variable property drawer of type `bool`. Inherits from `AtomDrawer<BoolVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColliderVariableDrawer`
-
-Variable property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `IntVariableDrawer`
-
-Variable property drawer of type `int`. Inherits from `AtomDrawer<IntVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringVariableDrawer`
-
-Variable property drawer of type `string`. Inherits from `AtomDrawer<StringVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `AtomBaseVariableListDrawer`
-
-A custom property drawer for AtomBaseVariableList.
-
---
-
-## `IntIntEventDrawer`
-
-Event x 2 property drawer of type `int`. Inherits from `AtomDrawer<IntIntEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColorColorEventDrawer`
-
-Event x 2 property drawer of type `Color`. Inherits from `AtomDrawer<ColorColorEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringStringEventDrawer`
-
-Event x 2 property drawer of type `string`. Inherits from `AtomDrawer<StringStringEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector2Vector2EventDrawer`
-
-Event x 2 property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2Vector2Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector3EventDrawer`
-
-Event property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `FloatEventDrawer`
-
-Event property drawer of type `float`. Inherits from `AtomDrawer<FloatEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColliderColliderEventDrawer`
-
-Event x 2 property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderColliderEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `GameObjectEventDrawer`
-
-Event property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringEventDrawer`
-
-Event property drawer of type `string`. Inherits from `AtomDrawer<StringEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `AtomBaseVariableEventDrawer`
-
-Event property drawer of type `AtomBaseVariable`. Inherits from `AtomDrawer<AtomBaseVariableEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Collider2DCollider2DEventDrawer`
-
-Event x 2 property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DCollider2DEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
 ## `VoidEventDrawer`

 Event property drawer of type `Void`. Inherits from `AtomDrawer<VoidEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.

 ---
-
-## `Collider2DEventDrawer`
-
-Event property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `FloatFloatEventDrawer`
-
-Event x 2 property drawer of type `float`. Inherits from `AtomDrawer<FloatFloatEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector3Vector3EventDrawer`
-
-Event x 2 property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3Vector3Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `IntEventDrawer`
-
-Event property drawer of type `int`. Inherits from `AtomDrawer<IntEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `GameObjectGameObjectEventDrawer`
-
-Event x 2 property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectGameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `BoolBoolEventDrawer`
-
-Event x 2 property drawer of type `bool`. Inherits from `AtomDrawer<BoolBoolEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColliderEventDrawer`
-
-Event property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector2EventDrawer`
-
-Event property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2Event>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColorEventDrawer`
-
-Event property drawer of type `Color`. Inherits from `AtomDrawer<ColorEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `BoolEventDrawer`
-
-Event property drawer of type `bool`. Inherits from `AtomDrawer<BoolEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `FloatValueListDrawer`
-
-Value List property drawer of type `float`. Inherits from `AtomDrawer<FloatValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `BoolValueListDrawer`
-
-Value List property drawer of type `bool`. Inherits from `AtomDrawer<BoolValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `IntValueListDrawer`
-
-Value List property drawer of type `int`. Inherits from `AtomDrawer<IntValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColorValueListDrawer`
-
-Value List property drawer of type `Color`. Inherits from `AtomDrawer<ColorValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `StringValueListDrawer`
-
-Value List property drawer of type `string`. Inherits from `AtomDrawer<StringValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector3ValueListDrawer`
-
-Value List property drawer of type `Vector3`. Inherits from `AtomDrawer<Vector3ValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `GameObjectValueListDrawer`
-
-Value List property drawer of type `GameObject`. Inherits from `AtomDrawer<GameObjectValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ColliderValueListDrawer`
-
-Value List property drawer of type `Collider`. Inherits from `AtomDrawer<ColliderValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Vector2ValueListDrawer`
-
-Value List property drawer of type `Vector2`. Inherits from `AtomDrawer<Vector2ValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `Collider2DValueListDrawer`
-
-Value List property drawer of type `Collider2D`. Inherits from `AtomDrawer<Collider2DValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
-
---
-
-## `ClampBaseEditor`
-
-Base class for a custom editor for Clamp Functions.
-
---
-
-## `ClampFloatEditor`
-
-Custom editor for ClampFloat.
-
---
-
-## `ClampIntEditor`
-
-Custom editor for ClampInt.
-
---
--- a/docs/api/unityatoms.md
+++ b/docs/api/unityatoms.md
--- a/docs/api/unityatoms.mobile.editor.md
+++ b/docs/api/unityatoms.mobile.editor.md
@ -19,9 +19,9 @@ Event property drawer of type `TouchUserInput`. Inherits from `AtomEventEditor<T

 ---

-## `TouchUserInputTouchUserInputEventEditor`
+## `TouchUserInputPairEventEditor`

-Event property drawer of type `<TouchUserInput, TouchUserInput>`. Inherits from `AtomEventEditor<TouchUserInput, TouchUserInput, TouchUserInputEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+Event property drawer of type `TouchUserInputPair`. Inherits from `AtomEventEditor<TouchUserInputPair, TouchUserInputPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.

 ---

@ -37,9 +37,9 @@ Variable property drawer of type `TouchUserInput`. Inherits from `AtomDrawer<Tou

 ---

-## `TouchUserInputTouchUserInputEventDrawer`
+## `TouchUserInputPairEventDrawer`

-Event x 2 property drawer of type `TouchUserInput`. Inherits from `AtomDrawer<TouchUserInputTouchUserInputEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+Event property drawer of type `TouchUserInputPair`. Inherits from `AtomDrawer<TouchUserInputPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.

 ---

--- a/docs/api/unityatoms.mobile.md
+++ b/docs/api/unityatoms.mobile.md
@ -7,6 +7,18 @@ sidebar_label: UnityAtoms.Mobile

 # Namespace - `UnityAtoms.Mobile`

+## `TouchUserInputPairEventReferenceListener`
+
+Event Reference Listener of type `TouchUserInputPair`. Inherits from `AtomEventReferenceListener<TouchUserInputPair, TouchUserInputPairAction, TouchUserInputPairEvent, TouchUserInputPairEventReference, TouchUserInputPairUnityEvent>`.
+
+---
+
+## `TouchUserInputEventReferenceListener`
+
+Event Reference Listener of type `TouchUserInput`. Inherits from `AtomEventReferenceListener<TouchUserInput, TouchUserInputAction, TouchUserInputEvent, TouchUserInputEventReference, TouchUserInputUnityEvent>`.
+
+---
+
 ## `TouchUserInput`

 Module class holding data for touch user input.
@ -144,7 +156,19 @@ Enum for different touch user input states.

 ## `TouchUserInputReference`

-Reference of type `TouchUserInput`. Inherits from `EquatableAtomReference<TouchUserInput, TouchUserInputConstant, TouchUserInputVariable, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputTouchUserInputFunction, TouchUserInputVariableInstancer>`.
+Reference of type `TouchUserInput`. Inherits from `EquatableAtomReference<TouchUserInput, TouchUserInputPair, TouchUserInputConstant, TouchUserInputVariable, TouchUserInputEvent, TouchUserInputPairEvent, TouchUserInputTouchUserInputFunction, TouchUserInputVariableInstancer>`.
+
+---
+
+## `TouchUserInputPair`
+
+IPair of type `<TouchUserInput>`. Inherits from `IPair<TouchUserInput>`.
+
+---
+
+## `TouchUserInputPairUnityEvent`
+
+None generic Unity Event of type `TouchUserInputPair`. Inherits from `UnityEvent<TouchUserInputPair>`.

 ---

@ -168,31 +192,43 @@ Constant of type `TouchUserInput`. Inherits from `AtomBaseVariable<TouchUserInpu

 ## `TouchUserInputEventReference`

-Event Reference of type `TouchUserInput`. Inherits from `AtomEventReference<TouchUserInput, TouchUserInputVariable, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputTouchUserInputFunction, TouchUserInputVariableInstancer>`.
+Event Reference of type `TouchUserInput`. Inherits from `AtomEventReference<TouchUserInput, TouchUserInputVariable, TouchUserInputEvent, TouchUserInputVariableInstancer, TouchUserInputEventInstancer>`.

 ---

-## `TouchUserInputTouchUserInputEventReference`
+## `TouchUserInputPairEventReference`

-Event x 2 Reference of type `TouchUserInput`. Inherits from `AtomEventX2Reference<TouchUserInput, TouchUserInputVariable, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputTouchUserInputFunction, TouchUserInputVariableInstancer>`.
+Event Reference of type `TouchUserInputPair`. Inherits from `AtomEventReference<TouchUserInputPair, TouchUserInputVariable, TouchUserInputPairEvent, TouchUserInputVariableInstancer, TouchUserInputPairEventInstancer>`.

 ---

 ## `TouchUserInputVariableInstancer`

-Variable Instancer of type `TouchUserInput`. Inherits from `AtomVariableInstancer<TouchUserInputVariable, TouchUserInput, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputTouchUserInputFunction>`.
+Variable Instancer of type `TouchUserInput`. Inherits from `AtomVariableInstancer<TouchUserInputVariable, TouchUserInputPair, TouchUserInput, TouchUserInputEvent, TouchUserInputPairEvent, TouchUserInputTouchUserInputFunction>`.
+
+---
+
+## `TouchUserInputPairEventInstancer`
+
+Event Instancer of type `TouchUserInputPair`. Inherits from `AtomEventInstancer<TouchUserInputPair, TouchUserInputPairEvent>`.
+
+---
+
+## `TouchUserInputEventInstancer`
+
+Event Instancer of type `TouchUserInput`. Inherits from `AtomEventInstancer<TouchUserInput, TouchUserInputEvent>`.

 ---

 ## `TouchUserInputVariable`

-Variable of type `TouchUserInput`. Inherits from `EquatableAtomVariable<TouchUserInput, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputTouchUserInputFunction>`.
+Variable of type `TouchUserInput`. Inherits from `EquatableAtomVariable<TouchUserInput, TouchUserInputPair, TouchUserInputEvent, TouchUserInputPairEvent, TouchUserInputTouchUserInputFunction>`.

 ---

-## `TouchUserInputTouchUserInputAction`
+## `TouchUserInputPairAction`

-Action x 2 of type `TouchUserInput`. Inherits from `AtomAction<TouchUserInput, TouchUserInput>`.
+Action of type `TouchUserInputPair`. Inherits from `AtomAction<TouchUserInputPair>`.

 ---

@ -226,9 +262,9 @@ Function x 2 of type `TouchUserInput`. Inherits from `AtomFunction<TouchUserInpu

 ---

-## `TouchUserInputTouchUserInputEvent`
+## `TouchUserInputPairEvent`

-Event x 2 of type `TouchUserInput`. Inherits from `AtomEvent<TouchUserInput, TouchUserInput>`.
+Event of type `TouchUserInputPair`. Inherits from `AtomEvent<TouchUserInputPair>`.

 ---

@ -238,18 +274,6 @@ Event of type `TouchUserInput`. Inherits from `AtomEvent<TouchUserInput>`.

 ---

-## `TouchUserInputTouchUserInputListener`
-
-Listener x 2 of type `TouchUserInput`. Inherits from `AtomX2Listener<TouchUserInput, TouchUserInputTouchUserInputAction, TouchUserInputVariable, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputTouchUserInputFunction, TouchUserInputVariableInstancer, TouchUserInputTouchUserInputEventReference, TouchUserInputTouchUserInputUnityEvent>`.
-
---
-
-## `TouchUserInputListener`
-
-Listener of type `TouchUserInput`. Inherits from `AtomListener<TouchUserInput, TouchUserInputAction, TouchUserInputVariable, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputTouchUserInputFunction, TouchUserInputVariableInstancer, TouchUserInputEventReference, TouchUserInputUnityEvent>`.
-
---
-
 ## `TouchUserInputValueList`

 Value List of type `TouchUserInput`. Inherits from `AtomValueList<TouchUserInput, TouchUserInputEvent>`.
@ -258,6 +282,6 @@ Value List of type `TouchUserInput`. Inherits from `AtomValueList<TouchUserInput

 ## `SetTouchUserInputVariableValue`

-Set variable value Action of type `TouchUserInput`. Inherits from `SetVariableValue<TouchUserInput, TouchUserInputVariable, TouchUserInputConstant, TouchUserInputReference, TouchUserInputEvent, TouchUserInputTouchUserInputEvent, TouchUserInputVariableInstancer>`.
+Set variable value Action of type `TouchUserInput`. Inherits from `SetVariableValue<TouchUserInput, TouchUserInputPair, TouchUserInputVariable, TouchUserInputConstant, TouchUserInputReference, TouchUserInputEvent, TouchUserInputPairEvent, TouchUserInputVariableInstancer>`.

 ---
--- a/docs/api/unityatoms.monohooks.editor.md
+++ b/docs/api/unityatoms.monohooks.editor.md
@ -0,0 +1,104 @@
+---
+id: unityatoms.monohooks.editor
+title: UnityAtoms.MonoHooks.Editor
+hide_title: true
+sidebar_label: UnityAtoms.MonoHooks.Editor
+---
+
+# Namespace - `UnityAtoms.MonoHooks.Editor`
+
+## `Collider2DGameObjectVariableEditor`
+
+Variable Inspector of type `Collider2DGameObject`. Inherits from `AtomVariableEditor`
+
+---
+
+## `ColliderGameObjectVariableEditor`
+
+Variable Inspector of type `ColliderGameObject`. Inherits from `AtomVariableEditor`
+
+---
+
+## `Collider2DGameObjectPairEventEditor`
+
+Event property drawer of type `Collider2DGameObjectPair`. Inherits from `AtomEventEditor<Collider2DGameObjectPair, Collider2DGameObjectPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DGameObjectEventEditor`
+
+Event property drawer of type `Collider2DGameObject`. Inherits from `AtomEventEditor<Collider2DGameObject, Collider2DGameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderGameObjectEventEditor`
+
+Event property drawer of type `ColliderGameObject`. Inherits from `AtomEventEditor<ColliderGameObject, ColliderGameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderGameObjectPairEventEditor`
+
+Event property drawer of type `ColliderGameObjectPair`. Inherits from `AtomEventEditor<ColliderGameObjectPair, ColliderGameObjectPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderGameObjectConstantDrawer`
+
+Constant property drawer of type `ColliderGameObject`. Inherits from `AtomDrawer<ColliderGameObjectConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DGameObjectConstantDrawer`
+
+Constant property drawer of type `Collider2DGameObject`. Inherits from `AtomDrawer<Collider2DGameObjectConstant>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderGameObjectVariableDrawer`
+
+Variable property drawer of type `ColliderGameObject`. Inherits from `AtomDrawer<ColliderGameObjectVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DGameObjectVariableDrawer`
+
+Variable property drawer of type `Collider2DGameObject`. Inherits from `AtomDrawer<Collider2DGameObjectVariable>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderGameObjectPairEventDrawer`
+
+Event property drawer of type `ColliderGameObjectPair`. Inherits from `AtomDrawer<ColliderGameObjectPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderGameObjectEventDrawer`
+
+Event property drawer of type `ColliderGameObject`. Inherits from `AtomDrawer<ColliderGameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DGameObjectEventDrawer`
+
+Event property drawer of type `Collider2DGameObject`. Inherits from `AtomDrawer<Collider2DGameObjectEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DGameObjectPairEventDrawer`
+
+Event property drawer of type `Collider2DGameObjectPair`. Inherits from `AtomDrawer<Collider2DGameObjectPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `Collider2DGameObjectValueListDrawer`
+
+Value List property drawer of type `Collider2DGameObject`. Inherits from `AtomDrawer<Collider2DGameObjectValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
+
+## `ColliderGameObjectValueListDrawer`
+
+Value List property drawer of type `ColliderGameObject`. Inherits from `AtomDrawer<ColliderGameObjectValueList>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+
+---
--- a/docs/api/unityatoms.monohooks.md
+++ b/docs/api/unityatoms.monohooks.md
@ -7,6 +7,162 @@ sidebar_label: UnityAtoms.MonoHooks

 # Namespace - `UnityAtoms.MonoHooks`

+## `Collider2DGameObjectEventReferenceListener`
+
+Event Reference Listener of type `Collider2DGameObject`. Inherits from `AtomEventReferenceListener<Collider2DGameObject, Collider2DGameObjectAction, Collider2DGameObjectEvent, Collider2DGameObjectEventReference, Collider2DGameObjectUnityEvent>`.
+
+---
+
+## `ColliderGameObjectEventReferenceListener`
+
+Event Reference Listener of type `ColliderGameObject`. Inherits from `AtomEventReferenceListener<ColliderGameObject, ColliderGameObjectAction, ColliderGameObjectEvent, ColliderGameObjectEventReference, ColliderGameObjectUnityEvent>`.
+
+---
+
+## `Collider2DGameObjectPairEventReferenceListener`
+
+Event Reference Listener of type `Collider2DGameObjectPair`. Inherits from `AtomEventReferenceListener<Collider2DGameObjectPair, Collider2DGameObjectPairAction, Collider2DGameObjectPairEvent, Collider2DGameObjectPairEventReference, Collider2DGameObjectPairUnityEvent>`.
+
+---
+
+## `ColliderGameObjectPairEventReferenceListener`
+
+Event Reference Listener of type `ColliderGameObjectPair`. Inherits from `AtomEventReferenceListener<ColliderGameObjectPair, ColliderGameObjectPairAction, ColliderGameObjectPairEvent, ColliderGameObjectPairEventReference, ColliderGameObjectPairUnityEvent>`.
+
+---
+
+## `ColliderGameObjectReference`
+
+Reference of type `ColliderGameObject`. Inherits from `EquatableAtomReference<ColliderGameObject, ColliderGameObjectPair, ColliderGameObjectConstant, ColliderGameObjectVariable, ColliderGameObjectEvent, ColliderGameObjectPairEvent, ColliderGameObjectColliderGameObjectFunction, ColliderGameObjectVariableInstancer>`.
+
+---
+
+## `Collider2DGameObjectReference`
+
+Reference of type `Collider2DGameObject`. Inherits from `EquatableAtomReference<Collider2DGameObject, Collider2DGameObjectPair, Collider2DGameObjectConstant, Collider2DGameObjectVariable, Collider2DGameObjectEvent, Collider2DGameObjectPairEvent, Collider2DGameObjectCollider2DGameObjectFunction, Collider2DGameObjectVariableInstancer>`.
+
+---
+
+## `Collider2DGameObjectPair`
+
+IPair of type `<Collider2DGameObject>`. Inherits from `IPair<Collider2DGameObject>`.
+
+---
+
+## `ColliderGameObjectPair`
+
+IPair of type `<ColliderGameObject>`. Inherits from `IPair<ColliderGameObject>`.
+
+---
+
+## `Collider2DGameObjectUnityEvent`
+
+None generic Unity Event of type `Collider2DGameObject`. Inherits from `UnityEvent<Collider2DGameObject>`.
+
+---
+
+## `Collider2DGameObjectPairUnityEvent`
+
+None generic Unity Event of type `Collider2DGameObjectPair`. Inherits from `UnityEvent<Collider2DGameObjectPair>`.
+
+---
+
+## `ColliderGameObjectPairUnityEvent`
+
+None generic Unity Event of type `ColliderGameObjectPair`. Inherits from `UnityEvent<ColliderGameObjectPair>`.
+
+---
+
+## `ColliderGameObjectUnityEvent`
+
+None generic Unity Event of type `ColliderGameObject`. Inherits from `UnityEvent<ColliderGameObject>`.
+
+---
+
+## `ColliderGameObjectConstant`
+
+Constant of type `ColliderGameObject`. Inherits from `AtomBaseVariable<ColliderGameObject>`.
+
+---
+
+## `Collider2DGameObjectConstant`
+
+Constant of type `Collider2DGameObject`. Inherits from `AtomBaseVariable<Collider2DGameObject>`.
+
+---
+
+## `ColliderGameObjectPairEventReference`
+
+Event Reference of type `ColliderGameObjectPair`. Inherits from `AtomEventReference<ColliderGameObjectPair, ColliderGameObjectVariable, ColliderGameObjectPairEvent, ColliderGameObjectVariableInstancer, ColliderGameObjectPairEventInstancer>`.
+
+---
+
+## `Collider2DGameObjectEventReference`
+
+Event Reference of type `Collider2DGameObject`. Inherits from `AtomEventReference<Collider2DGameObject, Collider2DGameObjectVariable, Collider2DGameObjectEvent, Collider2DGameObjectVariableInstancer, Collider2DGameObjectEventInstancer>`.
+
+---
+
+## `Collider2DGameObjectPairEventReference`
+
+Event Reference of type `Collider2DGameObjectPair`. Inherits from `AtomEventReference<Collider2DGameObjectPair, Collider2DGameObjectVariable, Collider2DGameObjectPairEvent, Collider2DGameObjectVariableInstancer, Collider2DGameObjectPairEventInstancer>`.
+
+---
+
+## `ColliderGameObjectEventReference`
+
+Event Reference of type `ColliderGameObject`. Inherits from `AtomEventReference<ColliderGameObject, ColliderGameObjectVariable, ColliderGameObjectEvent, ColliderGameObjectVariableInstancer, ColliderGameObjectEventInstancer>`.
+
+---
+
+## `ColliderGameObjectVariableInstancer`
+
+Variable Instancer of type `ColliderGameObject`. Inherits from `AtomVariableInstancer<ColliderGameObjectVariable, ColliderGameObjectPair, ColliderGameObject, ColliderGameObjectEvent, ColliderGameObjectPairEvent, ColliderGameObjectColliderGameObjectFunction>`.
+
+---
+
+## `Collider2DGameObjectVariableInstancer`
+
+Variable Instancer of type `Collider2DGameObject`. Inherits from `AtomVariableInstancer<Collider2DGameObjectVariable, Collider2DGameObjectPair, Collider2DGameObject, Collider2DGameObjectEvent, Collider2DGameObjectPairEvent, Collider2DGameObjectCollider2DGameObjectFunction>`.
+
+---
+
+## `ColliderGameObjectEventInstancer`
+
+Event Instancer of type `ColliderGameObject`. Inherits from `AtomEventInstancer<ColliderGameObject, ColliderGameObjectEvent>`.
+
+---
+
+## `Collider2DGameObjectPairEventInstancer`
+
+Event Instancer of type `Collider2DGameObjectPair`. Inherits from `AtomEventInstancer<Collider2DGameObjectPair, Collider2DGameObjectPairEvent>`.
+
+---
+
+## `ColliderGameObjectPairEventInstancer`
+
+Event Instancer of type `ColliderGameObjectPair`. Inherits from `AtomEventInstancer<ColliderGameObjectPair, ColliderGameObjectPairEvent>`.
+
+---
+
+## `Collider2DGameObjectEventInstancer`
+
+Event Instancer of type `Collider2DGameObject`. Inherits from `AtomEventInstancer<Collider2DGameObject, Collider2DGameObjectEvent>`.
+
+---
+
+## `Collider2DGameObjectVariable`
+
+Variable of type `Collider2DGameObject`. Inherits from `EquatableAtomVariable<Collider2DGameObject, Collider2DGameObjectPair, Collider2DGameObjectEvent, Collider2DGameObjectPairEvent, Collider2DGameObjectCollider2DGameObjectFunction>`.
+
+---
+
+## `ColliderGameObjectVariable`
+
+Variable of type `ColliderGameObject`. Inherits from `EquatableAtomVariable<ColliderGameObject, ColliderGameObjectPair, ColliderGameObjectEvent, ColliderGameObjectPairEvent, ColliderGameObjectColliderGameObjectFunction>`.
+
+---
+
 ## `OnDestroyHook`

 Mono Hook for [`OnDestroy`](https://docs.unity3d.com/ScriptReference/MonoBehaviour.OnDestroy.html)
@ -17,6 +173,12 @@ Mono Hook for [`OnDestroy`](https://docs.unity3d.com/ScriptReference/MonoBehavio

 Base class for all `MonoHook`s of type `Collider`.

+### Properties
+
+#### `EventWithGameObject`
+
+Event including a GameObject reference.
+
 ---

 ## `OnUpdateHook`
@ -73,12 +235,11 @@ Set to true if Event should be triggered on `OnTriggerStay`

 ---

-## `MonoHook<E1,E2,EV,F>`
+## `MonoHook<E,EV,F>`

 #### Type Parameters

-   `E1` - Event of type `AtomEvent<EV>`
-   `E2` - Event of type `AtomEvent<EV, GameObject>`
+-   `E` - Event of type `AtomEvent<EV>`
 -   `EV` - Event value type
 -   `F` - Function type `AtomFunction<GameObject, GameObject>`

@ -86,22 +247,16 @@ Generic base class for all Mono Hooks.

 ### Variables

-#### `Event`
-
-The Event
-
---
-
-#### `EventWithGameObjectReference`
-
-Event including a GameObject reference.
-
---
-
 #### `_selectGameObjectReference`

 Selector function for the Event `EventWithGameObjectReference`. Makes it possible to for example select the parent GameObject and pass that a long to the `EventWithGameObjectReference`.

+### Properties
+
+#### `Event`
+
+The Event
+
 ---

 ## `OnLateUpdateHook`
@ -132,6 +287,12 @@ Mono Hook for `OnPointerDown`

 Base class for all `MonoHook`s of type `Collider2D`.

+### Properties
+
+#### `EventWithGameObject`
+
+Event including a GameObject reference.
+
 ---

 ## `OnAwakeHook`
@ -182,14 +343,86 @@ Selector function for the Event `EventWithGameObjectReference`. Makes it possibl

 ---

+## `Collider2DGameObjectAction`
+
+Action of type `Collider2DGameObject`. Inherits from `AtomAction<Collider2DGameObject>`.
+
+---
+
+## `Collider2DGameObjectPairAction`
+
+Action of type `Collider2DGameObjectPair`. Inherits from `AtomAction<Collider2DGameObjectPair>`.
+
+---
+
+## `ColliderGameObjectPairAction`
+
+Action of type `ColliderGameObjectPair`. Inherits from `AtomAction<ColliderGameObjectPair>`.
+
+---
+
+## `ColliderGameObjectAction`
+
+Action of type `ColliderGameObject`. Inherits from `AtomAction<ColliderGameObject>`.
+
+---
+
+## `ColliderGameObjectColliderGameObjectFunction`
+
+Function x 2 of type `ColliderGameObject`. Inherits from `AtomFunction<ColliderGameObject, ColliderGameObject>`.
+
+---
+
+## `Collider2DGameObjectCollider2DGameObjectFunction`
+
+Function x 2 of type `Collider2DGameObject`. Inherits from `AtomFunction<Collider2DGameObject, Collider2DGameObject>`.
+
+---
+
+## `ColliderGameObjectPairEvent`
+
+Event of type `ColliderGameObjectPair`. Inherits from `AtomEvent<ColliderGameObjectPair>`.
+
+---
+
 ## `ColliderGameObjectEvent`

-Event x 2 of type `Collider` and `GameObject`. Inherits from `AtomEvent<Collider, GameObject>`.
+Event of type `ColliderGameObject`. Inherits from `AtomEvent<ColliderGameObject>`.

 ---

 ## `Collider2DGameObjectEvent`

-Event x 2 of type `Collider2D` and `GameObject`. Inherits from `AtomEvent<Collider2D, GameObject>`.
+Event of type `Collider2DGameObject`. Inherits from `AtomEvent<Collider2DGameObject>`.
+
+---
+
+## `Collider2DGameObjectPairEvent`
+
+Event of type `Collider2DGameObjectPair`. Inherits from `AtomEvent<Collider2DGameObjectPair>`.
+
+---
+
+## `ColliderGameObjectValueList`
+
+Value List of type `ColliderGameObject`. Inherits from `AtomValueList<ColliderGameObject, ColliderGameObjectEvent>`.
+
+---
+
+## `Collider2DGameObjectValueList`
+
+Value List of type `Collider2DGameObject`. Inherits from `AtomValueList<Collider2DGameObject, Collider2DGameObjectEvent>`.
+
+---
+
+## `SetCollider2DGameObjectVariableValue`
+
+Set variable value Action of type `Collider2DGameObject`. Inherits from `SetVariableValue<Collider2DGameObject, Collider2DGameObjectPair, Collider2DGameObjectVariable, Collider2DGameObjectConstant, Collider2DGameObjectReference, Collider2DGameObjectEvent, Collider2DGameObjectPairEvent, Collider2DGameObjectVariableInstancer>`.
+
+---
+
+## `SetColliderGameObjectVariableValue`
+
+Set variable value Action of type `ColliderGameObject`. Inherits from `SetVariableValue<ColliderGameObject, ColliderGameObjectPair, ColliderGameObjectVariable, ColliderGameObjectConstant, ColliderGameObjectReference, ColliderGameObjectEvent, ColliderGameObjectPairEvent, ColliderGameObjectVariableInstancer>`.

 ---
--- a/docs/api/unityatoms.scenemgmt.editor.md
+++ b/docs/api/unityatoms.scenemgmt.editor.md
@ -25,9 +25,9 @@ Event property drawer of type `SceneField`. Inherits from `AtomEventEditor<Scene

 ---

-## `SceneFieldSceneFieldEventEditor`
+## `SceneFieldPairEventEditor`

-Event property drawer of type `<SceneField, SceneField>`. Inherits from `AtomEventEditor<SceneField, SceneField, SceneFieldEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+Event property drawer of type `SceneFieldPair`. Inherits from `AtomEventEditor<SceneFieldPair, SceneFieldPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.

 ---

@ -43,9 +43,9 @@ Variable property drawer of type `SceneField`. Inherits from `AtomDrawer<SceneFi

 ---

-## `SceneFieldSceneFieldEventDrawer`
+## `SceneFieldPairEventDrawer`

-Event x 2 property drawer of type `SceneField`. Inherits from `AtomDrawer<SceneFieldSceneFieldEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.
+Event property drawer of type `SceneFieldPair`. Inherits from `AtomDrawer<SceneFieldPairEvent>`. Only availble in `UNITY_2019_1_OR_NEWER`.

 ---

--- a/docs/api/unityatoms.scenemgmt.md
+++ b/docs/api/unityatoms.scenemgmt.md
@ -7,6 +7,18 @@ sidebar_label: UnityAtoms.SceneMgmt

 # Namespace - `UnityAtoms.SceneMgmt`

+## `SceneFieldPairEventReferenceListener`
+
+Event Reference Listener of type `SceneFieldPair`. Inherits from `AtomEventReferenceListener<SceneFieldPair, SceneFieldPairAction, SceneFieldPairEvent, SceneFieldPairEventReference, SceneFieldPairUnityEvent>`.
+
+---
+
+## `SceneFieldEventReferenceListener`
+
+Event Reference Listener of type `SceneField`. Inherits from `AtomEventReferenceListener<SceneField, SceneFieldAction, SceneFieldEvent, SceneFieldEventReference, SceneFieldUnityEvent>`.
+
+---
+
 ## `SceneField`

 Struct to hold data about a scene.
@ -131,7 +143,19 @@ None equality operator.

 ## `SceneFieldReference`

-Reference of type `SceneField`. Inherits from `EquatableAtomReference<SceneField, SceneFieldConstant, SceneFieldVariable, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldSceneFieldFunction, SceneFieldVariableInstancer>`.
+Reference of type `SceneField`. Inherits from `EquatableAtomReference<SceneField, SceneFieldPair, SceneFieldConstant, SceneFieldVariable, SceneFieldEvent, SceneFieldPairEvent, SceneFieldSceneFieldFunction, SceneFieldVariableInstancer>`.
+
+---
+
+## `SceneFieldPair`
+
+IPair of type `<SceneField>`. Inherits from `IPair<SceneField>`.
+
+---
+
+## `SceneFieldPairUnityEvent`
+
+None generic Unity Event of type `SceneFieldPair`. Inherits from `UnityEvent<SceneFieldPair>`.

 ---

@ -153,27 +177,45 @@ Constant of type `SceneField`. Inherits from `AtomBaseVariable<SceneField>`.

 ---

-## `SceneFieldEventReference`
+## `SceneFieldPairEventReference`

-Event Reference of type `SceneField`. Inherits from `AtomEventReference<SceneField, SceneFieldVariable, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldSceneFieldFunction, SceneFieldVariableInstancer>`.
+Event Reference of type `SceneFieldPair`. Inherits from `AtomEventReference<SceneFieldPair, SceneFieldVariable, SceneFieldPairEvent, SceneFieldVariableInstancer, SceneFieldPairEventInstancer>`.

 ---

-## `SceneFieldSceneFieldEventReference`
+## `SceneFieldEventReference`

-Event x 2 Reference of type `SceneField`. Inherits from `AtomEventX2Reference<SceneField, SceneFieldVariable, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldSceneFieldFunction, SceneFieldVariableInstancer>`.
+Event Reference of type `SceneField`. Inherits from `AtomEventReference<SceneField, SceneFieldVariable, SceneFieldEvent, SceneFieldVariableInstancer, SceneFieldEventInstancer>`.

 ---

 ## `SceneFieldVariableInstancer`

-Variable Instancer of type `SceneField`. Inherits from `AtomVariableInstancer<SceneFieldVariable, SceneField, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldSceneFieldFunction>`.
+Variable Instancer of type `SceneField`. Inherits from `AtomVariableInstancer<SceneFieldVariable, SceneFieldPair, SceneField, SceneFieldEvent, SceneFieldPairEvent, SceneFieldSceneFieldFunction>`.
+
+---
+
+## `SceneFieldEventInstancer`
+
+Event Instancer of type `SceneField`. Inherits from `AtomEventInstancer<SceneField, SceneFieldEvent>`.
+
+---
+
+## `SceneFieldPairEventInstancer`
+
+Event Instancer of type `SceneFieldPair`. Inherits from `AtomEventInstancer<SceneFieldPair, SceneFieldPairEvent>`.

 ---

 ## `SceneFieldVariable`

-Variable of type `SceneField`. Inherits from `EquatableAtomVariable<SceneField, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldSceneFieldFunction>`.
+Variable of type `SceneField`. Inherits from `EquatableAtomVariable<SceneField, SceneFieldPair, SceneFieldEvent, SceneFieldPairEvent, SceneFieldSceneFieldFunction>`.
+
+---
+
+## `SceneFieldPairAction`
+
+Action of type `SceneFieldPair`. Inherits from `AtomAction<SceneFieldPair>`.

 ---

@ -189,12 +231,6 @@ Do quit the apllication.

 ---

-## `SceneFieldSceneFieldAction`
-
-Action x 2 of type `SceneField`. Inherits from `AtomAction<SceneField, SceneField>`.
-
---
-
 ## `ChangeScene`

 Action to change scene.
@ -225,30 +261,18 @@ Function x 2 of type `SceneField`. Inherits from `AtomFunction<SceneField, Scene

 ---

+## `SceneFieldPairEvent`
+
+Event of type `SceneFieldPair`. Inherits from `AtomEvent<SceneFieldPair>`.
+
+---
+
 ## `SceneFieldEvent`

 Event of type `SceneField`. Inherits from `AtomEvent<SceneField>`.

 ---

-## `SceneFieldSceneFieldEvent`
-
-Event x 2 of type `SceneField`. Inherits from `AtomEvent<SceneField, SceneField>`.
-
---
-
-## `SceneFieldListener`
-
-Listener of type `SceneField`. Inherits from `AtomListener<SceneField, SceneFieldAction, SceneFieldVariable, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldSceneFieldFunction, SceneFieldVariableInstancer, SceneFieldEventReference, SceneFieldUnityEvent>`.
-
---
-
-## `SceneFieldSceneFieldListener`
-
-Listener x 2 of type `SceneField`. Inherits from `AtomX2Listener<SceneField, SceneFieldSceneFieldAction, SceneFieldVariable, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldSceneFieldFunction, SceneFieldVariableInstancer, SceneFieldSceneFieldEventReference, SceneFieldSceneFieldUnityEvent>`.
-
---
-
 ## `SceneFieldValueList`

 Value List of type `SceneField`. Inherits from `AtomValueList<SceneField, SceneFieldEvent>`.
@ -257,6 +281,6 @@ Value List of type `SceneField`. Inherits from `AtomValueList<SceneField, SceneF

 ## `SetSceneFieldVariableValue`

-Set variable value Action of type `SceneField`. Inherits from `SetVariableValue<SceneField, SceneFieldVariable, SceneFieldConstant, SceneFieldReference, SceneFieldEvent, SceneFieldSceneFieldEvent, SceneFieldVariableInstancer>`.
+Set variable value Action of type `SceneField`. Inherits from `SetVariableValue<SceneField, SceneFieldPair, SceneFieldVariable, SceneFieldConstant, SceneFieldReference, SceneFieldEvent, SceneFieldPairEvent, SceneFieldVariableInstancer>`.

 ---
--- a/docs/api/unityatoms.tags.md
+++ b/docs/api/unityatoms.tags.md
@ -136,21 +136,6 @@ Check if the tag provided is associated with this `GameObject`.

 ---

-#### `HasTag(UnityEngine.GameObject,UnityAtoms.StringConstant)`
-
-Check if the tag provided is associated with this `GameObject`.
-
-##### Parameters
-
-   `go` - This `GameObject`
-   `tag` - The tag to search for.
-
-##### Returns
-
-`true` if the tag exists, otherwise `false`.
-
---
-
 #### `HasAnyTag(UnityEngine.GameObject,System.Collections.Generic.List{System.String})`

 Check if any of the tags provided are associated with this `GameObject`.
@ -166,21 +151,6 @@ Check if any of the tags provided are associated with this `GameObject`.

 ---

-#### `HasAnyTag(UnityEngine.GameObject,System.Collections.Generic.List{UnityAtoms.StringConstant})`
-
-Check if any of the tags provided are associated with this `GameObject`.
-
-##### Parameters
-
-   `go` - This `GameObject`
-   `tags` - The tags to search for.
-
-##### Returns
-
-`true` if any of the tags exist, otherwise `false`.
-
---
-
 ## `AtomTags`

 A MonoBehaviour that adds tags the Unity Atoms way to a GameObject.
@ -207,16 +177,6 @@ Check if the tag provided is associated with this `GameObject`.

 ---

-#### `AddTag(UnityAtoms.StringConstant)`
-
-Add a tag to this `GameObject`.
-
-##### Parameters
-
-   `tag` - The tag to add as a `StringContant`.
-
---
-
 #### `RemoveTag(System.String)`

 Remove a tag from this `GameObject`.
--- a/docs/introduction/quick-start.md
+++ b/docs/introduction/quick-start.md
@ -75,7 +75,7 @@ Add the following to your `manifest.json`:
 {
    "dependencies": {
        ...
-        "com.mambojambostudios.unity-atoms": "https://github.com/AdamRamberg/unity-atoms.git#canary",
+        "com.mambojambostudios.unity-atoms": "https://github.com/AdamRamberg/unity-atoms.git#master",
        ...
    }
 }
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "com.mambojambostudios.unity-atoms",
-  "version": "3.0.0",
+  "version": "4.0.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "com.mambojambostudios.unity-atoms",
  "displayName": "Unity Atoms",
-  "version": "3.0.0",
+  "version": "4.0.0",
  "publishConfig": {
    "registry": "https://npm.pkg.github.com/"
  },
--- a/scripts/generateDocs.js
+++ b/scripts/generateDocs.js
@ -89,6 +89,8 @@ const run = async () => {
  const NAMESPACES = [
    "UnityAtoms.",
    "UnityAtoms.Editor.",
+    "UnityAtoms.BaseAtoms.",
+    "UnityAtoms.BaseAtoms.Editor.",
    "UnityAtoms.Tags.",
    "UnityAtoms.Tags.Editor.",
    "UnityAtoms.Mobile.",
--- a/website/core/Footer.js
+++ b/website/core/Footer.js
@ -42,7 +42,7 @@ class Footer extends React.Component {
            <h5>Docs</h5>
            <a href={this.docUrl('introduction/quick-start')}>Quick Start</a>
            <a href={this.docUrl('api/actions')}>API</a>
-            <a href={this.docUrl('subpackages/mobile')}>Subpackages</a>
+            <a href={this.docUrl('subpackages/base-atoms')}>Subpackages</a>
          </div>
          <div>
            <h5>Community</h5>
@ -51,7 +51,7 @@ class Footer extends React.Component {
              target="_blank"
              rel="noreferrer noopener"
            >
-            Discord
+              Discord
            </a>
            <a
              href="https://gitter.im/unity-atoms/community#"
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@ -5,6 +5,14 @@
    "previous": "Previous",
    "tagline": "Tiny modular pieces utilizing the power of Scriptable Objects",
    "docs": {
+      "api/unityatoms.baseatoms.editor": {
+        "title": "UnityAtoms.BaseAtoms.Editor",
+        "sidebar_label": "UnityAtoms.BaseAtoms.Editor"
+      },
+      "api/unityatoms.baseatoms": {
+        "title": "UnityAtoms.BaseAtoms",
+        "sidebar_label": "UnityAtoms.BaseAtoms"
+      },
      "api/unityatoms.editor": {
        "title": "UnityAtoms.Editor",
        "sidebar_label": "UnityAtoms.Editor"
@ -21,6 +29,10 @@
        "title": "UnityAtoms.Mobile",
        "sidebar_label": "UnityAtoms.Mobile"
      },
+      "api/unityatoms.monohooks.editor": {
+        "title": "UnityAtoms.MonoHooks.Editor",
+        "sidebar_label": "UnityAtoms.MonoHooks.Editor"
+      },
      "api/unityatoms.monohooks": {
        "title": "UnityAtoms.MonoHooks",
        "sidebar_label": "UnityAtoms.MonoHooks"
@ -64,6 +76,10 @@
      "README": {
        "title": "README"
      },
+      "subpackages/base-atoms": {
+        "title": "Base Atoms",
+        "sidebar_label": "Base Atoms"
+      },
      "subpackages/mobile": {
        "title": "Mobile",
        "sidebar_label": "Mobile"
--- a/website/sidebars.json
+++ b/website/sidebars.json
@ -10,6 +10,8 @@
    "API Reference": [
      "api/unityatoms",
      "api/unityatoms.editor",
+      "api/unityatoms.baseatoms",
+      "api/unityatoms.baseatoms.editor",
      "api/unityatoms.mobile",
      "api/unityatoms.mobile.editor",
      "api/unityatoms.monohooks",
@ -19,6 +21,7 @@
      "api/unityatoms.ui"
    ],
    "Subpackages": [
+      "subpackages/base-atoms",
      "subpackages/mobile",
      "subpackages/mono-hooks",
      "subpackages/scene-mgmt",