diff --git a/examples/typescript-node/package.json b/examples/typescript-node/package.json
index cb78796..3331a48 100644
--- a/examples/typescript-node/package.json
+++ b/examples/typescript-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-node",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "",
   "private": true,
   "main": "index.js",
diff --git a/examples/typescript-node/src/zeus/const.ts b/examples/typescript-node/src/zeus/const.ts
index fe863f4..cb05632 100644
--- a/examples/typescript-node/src/zeus/const.ts
+++ b/examples/typescript-node/src/zeus/const.ts
@@ -1,15 +1,13 @@
 /* eslint-disable */
 
 export const AllTypesProps: Record<string,any> = {
-	JSON: `scalar.JSON` as const,
-	createCard:{
-		skills:"SpecialSkills"
-	},
-	Query:{
-		cardById:{
+	SpecialSkills: "enum" as const,
+	Card:{
+		attack:{
 
 		}
 	},
+	JSON: `scalar.JSON` as const,
 	Mutation:{
 		addCard:{
 			card:"createCard"
@@ -20,37 +18,59 @@ export const AllTypesProps: Record<string,any> = {
 
 		}
 	},
-	Card:{
-		attack:{
+	Query:{
+		cardById:{
 
 		}
 	},
-	SpecialSkills: "enum" as const
+	createCard:{
+		skills:"SpecialSkills"
+	}
 }
 
 export const ReturnTypes: Record<string,any> = {
-	Powerup:{
-		name:"String"
+	S3Object:{
+		bucket:"String",
+		key:"String",
+		region:"String"
+	},
+	ChangeCard:{
+		"...on SpecialCard":"SpecialCard",
+		"...on EffectCard":"EffectCard"
+	},
+	Card:{
+		Attack:"Int",
+		Children:"Int",
+		Defense:"Int",
+		attack:"Card",
+		cardImage:"S3Object",
+		description:"String",
+		id:"ID",
+		image:"String",
+		info:"JSON",
+		name:"String",
+		skills:"SpecialSkills"
 	},
 	Nameable:{
-		"...on SpecialCard": "SpecialCard",
-		"...on EffectCard": "EffectCard",
 		"...on Card": "Card",
 		"...on CardStack": "CardStack",
+		"...on SpecialCard": "SpecialCard",
+		"...on EffectCard": "EffectCard",
 		name:"String"
 	},
-	SpecialCard:{
-		effect:"String",
+	JSON: `scalar.JSON` as const,
+	Powerup:{
 		name:"String"
 	},
-	EffectCard:{
-		effectSize:"Float",
+	Mutation:{
+		addCard:"Card"
+	},
+	CardStack:{
+		cards:"Card",
 		name:"String"
 	},
-	JSON: `scalar.JSON` as const,
-	ChangeCard:{
-		"...on SpecialCard":"SpecialCard",
-		"...on EffectCard":"EffectCard"
+	Public:{
+		powerups:"Powerup"
 	},
 	Query:{
 		cardById:"Card",
@@ -61,35 +81,15 @@ export const ReturnTypes: Record<string,any> = {
 		nameables:"Nameable",
 		public:"Public"
 	},
-	S3Object:{
-		bucket:"String",
-		key:"String",
-		region:"String"
-	},
-	Mutation:{
-		addCard:"Card"
-	},
-	Public:{
-		powerups:"Powerup"
-	},
-	Card:{
-		Attack:"Int",
-		Children:"Int",
-		Defense:"Int",
-		attack:"Card",
-		cardImage:"S3Object",
-		description:"String",
-		id:"ID",
-		image:"String",
-		info:"JSON",
-		name:"String",
-		skills:"SpecialSkills"
-	},
 	Subscription:{
 		deck:"Card"
 	},
-	CardStack:{
-		cards:"Card",
+	SpecialCard:{
+		effect:"String",
+		name:"String"
+	},
+	EffectCard:{
+		effectSize:"Float",
 		name:"String"
 	}
 }
diff --git a/examples/typescript-node/src/zeus/index.ts b/examples/typescript-node/src/zeus/index.ts
index 65d1c77..289a602 100644
--- a/examples/typescript-node/src/zeus/index.ts
+++ b/examples/typescript-node/src/zeus/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
 
-import { AllTypesProps, ReturnTypes, Ops } from './const';
+import { AllTypesProps, ReturnTypes, Ops } from './const.js';
 import fetch, { Response } from 'node-fetch';
 import WebSocket from 'ws';
 export const HOST = "https://faker.graphqleditor.com/a-team/olympus/graphql"
@@ -839,75 +839,18 @@ export type ScalarCoders = {
 type ZEUS_UNIONS = GraphQLTypes["ChangeCard"]
 
 export type ValueTypes = {
-    ["Powerup"]: AliasType<{
-	name?:boolean | `@${string}`,
-		__typename?: boolean | `@${string}`
-}>;
-	["Nameable"]:AliasType<{
-		name?:boolean | `@${string}`;
-		['...on SpecialCard']?: Omit<ValueTypes["SpecialCard"],keyof ValueTypes["Nameable"]>;
-		['...on EffectCard']?: Omit<ValueTypes["EffectCard"],keyof ValueTypes["Nameable"]>;
-		['...on Card']?: Omit<ValueTypes["Card"],keyof ValueTypes["Nameable"]>;
-		['...on CardStack']?: Omit<ValueTypes["CardStack"],keyof ValueTypes["Nameable"]>;
-		__typename?: boolean | `@${string}`
-}>;
-	["SpecialCard"]: AliasType<{
-	effect?:boolean | `@${string}`,
-	name?:boolean | `@${string}`,
-		__typename?: boolean | `@${string}`
-}>;
-	["EffectCard"]: AliasType<{
-	effectSize?:boolean | `@${string}`,
-	name?:boolean | `@${string}`,
-		__typename?: boolean | `@${string}`
-}>;
-	["JSON"]:unknown;
-	["ChangeCard"]: AliasType<{		["...on SpecialCard"] : ValueTypes["SpecialCard"],
-		["...on EffectCard"] : ValueTypes["EffectCard"]
-		__typename?: boolean | `@${string}`
-}>;
-	/** create card inputs<br> */
-["createCard"]: {
-	/** The name of a card<br> */
-	name: string | Variable<any, string>,
-	/** Description of a card<br> */
-	description: string | Variable<any, string>,
-	/** <div>How many children the greek god had</div> */
-	Children?: number | undefined | null | Variable<any, string>,
-	/** The attack power<br> */
-	Attack: number | Variable<any, string>,
-	/** The defense power<br> */
-	Defense: number | Variable<any, string>,
-	/** input skills */
-	skills?: Array<ValueTypes["SpecialSkills"]> | undefined | null | Variable<any, string>
-};
-	["Query"]: AliasType<{
-cardById?: [{	cardId?: string | undefined | null | Variable<any, string>},ValueTypes["Card"]],
-	/** Draw a card<br> */
-	drawCard?:ValueTypes["Card"],
-	drawChangeCard?:ValueTypes["ChangeCard"],
-	/** list All Cards availble<br> */
-	listCards?:ValueTypes["Card"],
-	myStacks?:ValueTypes["CardStack"],
-	nameables?:ValueTypes["Nameable"],
-	public?:ValueTypes["Public"],
-		__typename?: boolean | `@${string}`
-}>;
-	/** Aws S3 File */
+    /** Aws S3 File */
 ["S3Object"]: AliasType<{
 	bucket?:boolean | `@${string}`,
 	key?:boolean | `@${string}`,
 	region?:boolean | `@${string}`,
 		__typename?: boolean | `@${string}`
 }>;
-	["Mutation"]: AliasType<{
-addCard?: [{	card: ValueTypes["createCard"] | Variable<any, string>},ValueTypes["Card"]],
-		__typename?: boolean | `@${string}`
-}>;
-	["Public"]: AliasType<{
-powerups?: [{	filter: string | Variable<any, string>},ValueTypes["Powerup"]],
+	["ChangeCard"]: AliasType<{		["...on SpecialCard"] : ValueTypes["SpecialCard"],
+		["...on EffectCard"] : ValueTypes["EffectCard"]
 		__typename?: boolean | `@${string}`
 }>;
+	["SpecialSkills"]:SpecialSkills;
 	/** Card used in card game<br> */
 ["Card"]: AliasType<{
 	/** The attack power<br> */
@@ -930,8 +873,21 @@ attack?: [{	/** Attacked card/card ids<br> */
 	skills?:boolean | `@${string}`,
 		__typename?: boolean | `@${string}`
 }>;
-	["Subscription"]: AliasType<{
-	deck?:ValueTypes["Card"],
+	["Nameable"]:AliasType<{
+		name?:boolean | `@${string}`;
+		['...on Card']?: Omit<ValueTypes["Card"],keyof ValueTypes["Nameable"]>;
+		['...on CardStack']?: Omit<ValueTypes["CardStack"],keyof ValueTypes["Nameable"]>;
+		['...on SpecialCard']?: Omit<ValueTypes["SpecialCard"],keyof ValueTypes["Nameable"]>;
+		['...on EffectCard']?: Omit<ValueTypes["EffectCard"],keyof ValueTypes["Nameable"]>;
+		__typename?: boolean | `@${string}`
+}>;
+	["JSON"]:unknown;
+	["Powerup"]: AliasType<{
+	name?:boolean | `@${string}`,
+		__typename?: boolean | `@${string}`
+}>;
+	["Mutation"]: AliasType<{
+addCard?: [{	card: ValueTypes["createCard"] | Variable<any, string>},ValueTypes["Card"]],
 		__typename?: boolean | `@${string}`
 }>;
 	/** Stack of cards */
@@ -940,20 +896,24 @@ attack?: [{	/** Attacked card/card ids<br> */
 	name?:boolean | `@${string}`,
 		__typename?: boolean | `@${string}`
 }>;
-	["SpecialSkills"]:SpecialSkills
-  }
-
-export type ResolverInputTypes = {
-    ["Powerup"]: AliasType<{
-	name?:boolean | `@${string}`,
+	["Public"]: AliasType<{
+powerups?: [{	filter: string | Variable<any, string>},ValueTypes["Powerup"]],
 		__typename?: boolean | `@${string}`
 }>;
-	["Nameable"]:AliasType<{
-		name?:boolean | `@${string}`;
-		['...on SpecialCard']?: Omit<ResolverInputTypes["SpecialCard"],keyof ResolverInputTypes["Nameable"]>;
-		['...on EffectCard']?: Omit<ResolverInputTypes["EffectCard"],keyof ResolverInputTypes["Nameable"]>;
-		['...on Card']?: Omit<ResolverInputTypes["Card"],keyof ResolverInputTypes["Nameable"]>;
-		['...on CardStack']?: Omit<ResolverInputTypes["CardStack"],keyof ResolverInputTypes["Nameable"]>;
+	["Query"]: AliasType<{
+cardById?: [{	cardId?: string | undefined | null | Variable<any, string>},ValueTypes["Card"]],
+	/** Draw a card<br> */
+	drawCard?:ValueTypes["Card"],
+	drawChangeCard?:ValueTypes["ChangeCard"],
+	/** list All Cards availble<br> */
+	listCards?:ValueTypes["Card"],
+	myStacks?:ValueTypes["CardStack"],
+	nameables?:ValueTypes["Nameable"],
+	public?:ValueTypes["Public"],
+		__typename?: boolean | `@${string}`
+}>;
+	["Subscription"]: AliasType<{
+	deck?:ValueTypes["Card"],
 		__typename?: boolean | `@${string}`
 }>;
 	["SpecialCard"]: AliasType<{
@@ -965,55 +925,38 @@ export type ResolverInputTypes = {
 	effectSize?:boolean | `@${string}`,
 	name?:boolean | `@${string}`,
 		__typename?: boolean | `@${string}`
-}>;
-	["JSON"]:unknown;
-	["ChangeCard"]: AliasType<{
-	SpecialCard?:ResolverInputTypes["SpecialCard"],
-	EffectCard?:ResolverInputTypes["EffectCard"],
-		__typename?: boolean | `@${string}`
 }>;
 	/** create card inputs<br> */
 ["createCard"]: {
 	/** The name of a card<br> */
-	name: string,
+	name: string | Variable<any, string>,
 	/** Description of a card<br> */
-	description: string,
+	description: string | Variable<any, string>,
 	/** <div>How many children the greek god had</div> */
-	Children?: number | undefined | null,
+	Children?: number | undefined | null | Variable<any, string>,
 	/** The attack power<br> */
-	Attack: number,
+	Attack: number | Variable<any, string>,
 	/** The defense power<br> */
-	Defense: number,
+	Defense: number | Variable<any, string>,
 	/** input skills */
-	skills?: Array<ResolverInputTypes["SpecialSkills"]> | undefined | null
-};
-	["Query"]: AliasType<{
-cardById?: [{	cardId?: string | undefined | null},ResolverInputTypes["Card"]],
-	/** Draw a card<br> */
-	drawCard?:ResolverInputTypes["Card"],
-	drawChangeCard?:ResolverInputTypes["ChangeCard"],
-	/** list All Cards availble<br> */
-	listCards?:ResolverInputTypes["Card"],
-	myStacks?:ResolverInputTypes["CardStack"],
-	nameables?:ResolverInputTypes["Nameable"],
-	public?:ResolverInputTypes["Public"],
-		__typename?: boolean | `@${string}`
-}>;
-	/** Aws S3 File */
+	skills?: Array<ValueTypes["SpecialSkills"]> | undefined | null | Variable<any, string>
+}
+  }
+
+export type ResolverInputTypes = {
+    /** Aws S3 File */
 ["S3Object"]: AliasType<{
 	bucket?:boolean | `@${string}`,
 	key?:boolean | `@${string}`,
 	region?:boolean | `@${string}`,
 		__typename?: boolean | `@${string}`
 }>;
-	["Mutation"]: AliasType<{
-addCard?: [{	card: ResolverInputTypes["createCard"]},ResolverInputTypes["Card"]],
-		__typename?: boolean | `@${string}`
-}>;
-	["Public"]: AliasType<{
-powerups?: [{	filter: string},ResolverInputTypes["Powerup"]],
+	["ChangeCard"]: AliasType<{
+	SpecialCard?:ResolverInputTypes["SpecialCard"],
+	EffectCard?:ResolverInputTypes["EffectCard"],
 		__typename?: boolean | `@${string}`
 }>;
+	["SpecialSkills"]:SpecialSkills;
 	/** Card used in card game<br> */
 ["Card"]: AliasType<{
 	/** The attack power<br> */
@@ -1036,8 +979,21 @@ attack?: [{	/** Attacked card/card ids<br> */
 	skills?:boolean | `@${string}`,
 		__typename?: boolean | `@${string}`
 }>;
-	["Subscription"]: AliasType<{
-	deck?:ResolverInputTypes["Card"],
+	["Nameable"]:AliasType<{
+		name?:boolean | `@${string}`;
+		['...on Card']?: Omit<ResolverInputTypes["Card"],keyof ResolverInputTypes["Nameable"]>;
+		['...on CardStack']?: Omit<ResolverInputTypes["CardStack"],keyof ResolverInputTypes["Nameable"]>;
+		['...on SpecialCard']?: Omit<ResolverInputTypes["SpecialCard"],keyof ResolverInputTypes["Nameable"]>;
+		['...on EffectCard']?: Omit<ResolverInputTypes["EffectCard"],keyof ResolverInputTypes["Nameable"]>;
+		__typename?: boolean | `@${string}`
+}>;
+	["JSON"]:unknown;
+	["Powerup"]: AliasType<{
+	name?:boolean | `@${string}`,
+		__typename?: boolean | `@${string}`
+}>;
+	["Mutation"]: AliasType<{
+addCard?: [{	card: ResolverInputTypes["createCard"]},ResolverInputTypes["Card"]],
 		__typename?: boolean | `@${string}`
 }>;
 	/** Stack of cards */
@@ -1046,30 +1002,36 @@ attack?: [{	/** Attacked card/card ids<br> */
 	name?:boolean | `@${string}`,
 		__typename?: boolean | `@${string}`
 }>;
-	["SpecialSkills"]:SpecialSkills;
-	["schema"]: AliasType<{
-	query?:ResolverInputTypes["Query"],
-	mutation?:ResolverInputTypes["Mutation"],
-	subscription?:ResolverInputTypes["Subscription"],
+	["Public"]: AliasType<{
+powerups?: [{	filter: string},ResolverInputTypes["Powerup"]],
 		__typename?: boolean | `@${string}`
-}>
-  }
-
-export type ModelTypes = {
-    ["Powerup"]: {
-		name?: string | undefined
-};
-	["Nameable"]: ModelTypes["SpecialCard"] | ModelTypes["EffectCard"] | ModelTypes["Card"] | ModelTypes["CardStack"];
-	["SpecialCard"]: {
-		effect: string,
-	name: string
-};
-	["EffectCard"]: {
-		effectSize: number,
-	name: string
-};
-	["JSON"]:any;
-	["ChangeCard"]:ModelTypes["SpecialCard"] | ModelTypes["EffectCard"];
+}>;
+	["Query"]: AliasType<{
+cardById?: [{	cardId?: string | undefined | null},ResolverInputTypes["Card"]],
+	/** Draw a card<br> */
+	drawCard?:ResolverInputTypes["Card"],
+	drawChangeCard?:ResolverInputTypes["ChangeCard"],
+	/** list All Cards availble<br> */
+	listCards?:ResolverInputTypes["Card"],
+	myStacks?:ResolverInputTypes["CardStack"],
+	nameables?:ResolverInputTypes["Nameable"],
+	public?:ResolverInputTypes["Public"],
+		__typename?: boolean | `@${string}`
+}>;
+	["Subscription"]: AliasType<{
+	deck?:ResolverInputTypes["Card"],
+		__typename?: boolean | `@${string}`
+}>;
+	["SpecialCard"]: AliasType<{
+	effect?:boolean | `@${string}`,
+	name?:boolean | `@${string}`,
+		__typename?: boolean | `@${string}`
+}>;
+	["EffectCard"]: AliasType<{
+	effectSize?:boolean | `@${string}`,
+	name?:boolean | `@${string}`,
+		__typename?: boolean | `@${string}`
+}>;
 	/** create card inputs<br> */
 ["createCard"]: {
 	/** The name of a card<br> */
@@ -1077,38 +1039,31 @@ export type ModelTypes = {
 	/** Description of a card<br> */
 	description: string,
 	/** <div>How many children the greek god had</div> */
-	Children?: number | undefined,
+	Children?: number | undefined | null,
 	/** The attack power<br> */
 	Attack: number,
 	/** The defense power<br> */
 	Defense: number,
 	/** input skills */
-	skills?: Array<ModelTypes["SpecialSkills"]> | undefined
-};
-	["Query"]: {
-		cardById?: ModelTypes["Card"] | undefined,
-	/** Draw a card<br> */
-	drawCard: ModelTypes["Card"],
-	drawChangeCard: ModelTypes["ChangeCard"],
-	/** list All Cards availble<br> */
-	listCards: Array<ModelTypes["Card"]>,
-	myStacks?: Array<ModelTypes["CardStack"]> | undefined,
-	nameables: Array<ModelTypes["Nameable"]>,
-	public?: ModelTypes["Public"] | undefined
+	skills?: Array<ResolverInputTypes["SpecialSkills"]> | undefined | null
 };
-	/** Aws S3 File */
+	["schema"]: AliasType<{
+	query?:ResolverInputTypes["Query"],
+	mutation?:ResolverInputTypes["Mutation"],
+	subscription?:ResolverInputTypes["Subscription"],
+		__typename?: boolean | `@${string}`
+}>
+  }
+
+export type ModelTypes = {
+    /** Aws S3 File */
 ["S3Object"]: {
 		bucket: string,
 	key: string,
 	region: string
 };
-	["Mutation"]: {
-		/** add Card to Cards database<br> */
-	addCard: ModelTypes["Card"]
-};
-	["Public"]: {
-		powerups?: Array<ModelTypes["Powerup"]> | undefined
-};
+	["ChangeCard"]:ModelTypes["SpecialCard"] | ModelTypes["EffectCard"];
+	["SpecialSkills"]:SpecialSkills;
 	/** Card used in card game<br> */
 ["Card"]: {
 		/** The attack power<br> */
@@ -1130,54 +1085,48 @@ export type ModelTypes = {
 	name: string,
 	skills?: Array<ModelTypes["SpecialSkills"]> | undefined
 };
-	["Subscription"]: {
-		deck?: Array<ModelTypes["Card"]> | undefined
+	["Nameable"]: ModelTypes["Card"] | ModelTypes["CardStack"] | ModelTypes["SpecialCard"] | ModelTypes["EffectCard"];
+	["JSON"]:any;
+	["Powerup"]: {
+		name?: string | undefined
+};
+	["Mutation"]: {
+		/** add Card to Cards database<br> */
+	addCard: ModelTypes["Card"]
 };
 	/** Stack of cards */
 ["CardStack"]: {
 		cards?: Array<ModelTypes["Card"]> | undefined,
 	name: string
 };
-	["SpecialSkills"]:SpecialSkills;
-	["schema"]: {
-	query?: ModelTypes["Query"] | undefined,
-	mutation?: ModelTypes["Mutation"] | undefined,
-	subscription?: ModelTypes["Subscription"] | undefined
-}
-    }
-
-export type GraphQLTypes = {
-    ["Powerup"]: {
-	__typename: "Powerup",
-	name?: string | undefined
+	["Public"]: {
+		powerups?: Array<ModelTypes["Powerup"]> | undefined
 };
-	["Nameable"]: {
-	__typename:"SpecialCard" | "EffectCard" | "Card" | "CardStack",
-	name: string
-	['...on SpecialCard']: '__union' & GraphQLTypes["SpecialCard"];
-	['...on EffectCard']: '__union' & GraphQLTypes["EffectCard"];
-	['...on Card']: '__union' & GraphQLTypes["Card"];
-	['...on CardStack']: '__union' & GraphQLTypes["CardStack"];
+	["Query"]: {
+		cardById?: ModelTypes["Card"] | undefined,
+	/** Draw a card<br> */
+	drawCard: ModelTypes["Card"],
+	drawChangeCard: ModelTypes["ChangeCard"],
+	/** list All Cards availble<br> */
+	listCards: Array<ModelTypes["Card"]>,
+	myStacks?: Array<ModelTypes["CardStack"]> | undefined,
+	nameables: Array<ModelTypes["Nameable"]>,
+	public?: ModelTypes["Public"] | undefined
+};
+	["Subscription"]: {
+		deck?: Array<ModelTypes["Card"]> | undefined
 };
 	["SpecialCard"]: {
-	__typename: "SpecialCard",
-	effect: string,
+		effect: string,
 	name: string
 };
 	["EffectCard"]: {
-	__typename: "EffectCard",
-	effectSize: number,
+		effectSize: number,
 	name: string
-};
-	["JSON"]: "scalar" & { name: "JSON" };
-	["ChangeCard"]:{
-        	__typename:"SpecialCard" | "EffectCard"
-        	['...on SpecialCard']: '__union' & GraphQLTypes["SpecialCard"];
-	['...on EffectCard']: '__union' & GraphQLTypes["EffectCard"];
 };
 	/** create card inputs<br> */
 ["createCard"]: {
-		/** The name of a card<br> */
+	/** The name of a card<br> */
 	name: string,
 	/** Description of a card<br> */
 	description: string,
@@ -1188,36 +1137,29 @@ export type GraphQLTypes = {
 	/** The defense power<br> */
 	Defense: number,
 	/** input skills */
-	skills?: Array<GraphQLTypes["SpecialSkills"]> | undefined
-};
-	["Query"]: {
-	__typename: "Query",
-	cardById?: GraphQLTypes["Card"] | undefined,
-	/** Draw a card<br> */
-	drawCard: GraphQLTypes["Card"],
-	drawChangeCard: GraphQLTypes["ChangeCard"],
-	/** list All Cards availble<br> */
-	listCards: Array<GraphQLTypes["Card"]>,
-	myStacks?: Array<GraphQLTypes["CardStack"]> | undefined,
-	nameables: Array<GraphQLTypes["Nameable"]>,
-	public?: GraphQLTypes["Public"] | undefined
+	skills?: Array<ModelTypes["SpecialSkills"]> | undefined
 };
-	/** Aws S3 File */
+	["schema"]: {
+	query?: ModelTypes["Query"] | undefined,
+	mutation?: ModelTypes["Mutation"] | undefined,
+	subscription?: ModelTypes["Subscription"] | undefined
+}
+    }
+
+export type GraphQLTypes = {
+    /** Aws S3 File */
 ["S3Object"]: {
 	__typename: "S3Object",
 	bucket: string,
 	key: string,
 	region: string
 };
-	["Mutation"]: {
-	__typename: "Mutation",
-	/** add Card to Cards database<br> */
-	addCard: GraphQLTypes["Card"]
-};
-	["Public"]: {
-	__typename: "Public",
-	powerups?: Array<GraphQLTypes["Powerup"]> | undefined
+	["ChangeCard"]:{
+        	__typename:"SpecialCard" | "EffectCard"
+        	['...on SpecialCard']: '__union' & GraphQLTypes["SpecialCard"];
+	['...on EffectCard']: '__union' & GraphQLTypes["EffectCard"];
 };
+	["SpecialSkills"]: SpecialSkills;
 	/** Card used in card game<br> */
 ["Card"]: {
 	__typename: "Card",
@@ -1240,9 +1182,23 @@ export type GraphQLTypes = {
 	name: string,
 	skills?: Array<GraphQLTypes["SpecialSkills"]> | undefined
 };
-	["Subscription"]: {
-	__typename: "Subscription",
-	deck?: Array<GraphQLTypes["Card"]> | undefined
+	["Nameable"]: {
+	__typename:"Card" | "CardStack" | "SpecialCard" | "EffectCard",
+	name: string
+	['...on Card']: '__union' & GraphQLTypes["Card"];
+	['...on CardStack']: '__union' & GraphQLTypes["CardStack"];
+	['...on SpecialCard']: '__union' & GraphQLTypes["SpecialCard"];
+	['...on EffectCard']: '__union' & GraphQLTypes["EffectCard"];
+};
+	["JSON"]: "scalar" & { name: "JSON" };
+	["Powerup"]: {
+	__typename: "Powerup",
+	name?: string | undefined
+};
+	["Mutation"]: {
+	__typename: "Mutation",
+	/** add Card to Cards database<br> */
+	addCard: GraphQLTypes["Card"]
 };
 	/** Stack of cards */
 ["CardStack"]: {
@@ -1250,7 +1206,51 @@ export type GraphQLTypes = {
 	cards?: Array<GraphQLTypes["Card"]> | undefined,
 	name: string
 };
-	["SpecialSkills"]: SpecialSkills
+	["Public"]: {
+	__typename: "Public",
+	powerups?: Array<GraphQLTypes["Powerup"]> | undefined
+};
+	["Query"]: {
+	__typename: "Query",
+	cardById?: GraphQLTypes["Card"] | undefined,
+	/** Draw a card<br> */
+	drawCard: GraphQLTypes["Card"],
+	drawChangeCard: GraphQLTypes["ChangeCard"],
+	/** list All Cards availble<br> */
+	listCards: Array<GraphQLTypes["Card"]>,
+	myStacks?: Array<GraphQLTypes["CardStack"]> | undefined,
+	nameables: Array<GraphQLTypes["Nameable"]>,
+	public?: GraphQLTypes["Public"] | undefined
+};
+	["Subscription"]: {
+	__typename: "Subscription",
+	deck?: Array<GraphQLTypes["Card"]> | undefined
+};
+	["SpecialCard"]: {
+	__typename: "SpecialCard",
+	effect: string,
+	name: string
+};
+	["EffectCard"]: {
+	__typename: "EffectCard",
+	effectSize: number,
+	name: string
+};
+	/** create card inputs<br> */
+["createCard"]: {
+		/** The name of a card<br> */
+	name: string,
+	/** Description of a card<br> */
+	description: string,
+	/** <div>How many children the greek god had</div> */
+	Children?: number | undefined,
+	/** The attack power<br> */
+	Attack: number,
+	/** The defense power<br> */
+	Defense: number,
+	/** input skills */
+	skills?: Array<GraphQLTypes["SpecialSkills"]> | undefined
+}
     }
 export const enum SpecialSkills {
 	THUNDER = "THUNDER",
@@ -1259,7 +1259,7 @@ export const enum SpecialSkills {
 }
 
 type ZEUS_VARIABLES = {
+	["SpecialSkills"]: ValueTypes["SpecialSkills"];
 	["JSON"]: ValueTypes["JSON"];
 	["createCard"]: ValueTypes["createCard"];
-	["SpecialSkills"]: ValueTypes["SpecialSkills"];
 }
\ No newline at end of file
diff --git a/examples/typescript-node/zeus.graphql b/examples/typescript-node/zeus.graphql
index 35ec67b..56a8d08 100644
--- a/examples/typescript-node/zeus.graphql
+++ b/examples/typescript-node/zeus.graphql
@@ -1,94 +1,82 @@
-""""""
-type Powerup {
-  """"""
-  name: String
-}
-
-""""""
-interface Nameable {
+"""Aws S3 File"""
+type S3Object {
   """"""
-  name: String!
-}
+  bucket: String!
 
-""""""
-type SpecialCard implements Nameable {
   """"""
-  effect: String!
+  key: String!
 
   """"""
-  name: String!
+  region: String!
 }
 
 """"""
-type EffectCard implements Nameable {
-  """"""
-  effectSize: Float!
-
-  """"""
-  name: String!
-}
+union ChangeCard = SpecialCard | EffectCard
 
 """"""
-scalar JSON
+enum SpecialSkills {
+  """Lower enemy defense -5<br>"""
+  THUNDER
 
-""""""
-union ChangeCard = SpecialCard | EffectCard
+  """Attack multiple Cards at once<br>"""
+  RAIN
 
-"""create card inputs<br>"""
-input createCard {
-  """The name of a card<br>"""
-  name: String!
+  """50% chance to avoid any attack<br>"""
+  FIRE
+}
 
-  """Description of a card<br>"""
-  description: String!
+"""Card used in card game<br>"""
+type Card implements Nameable {
+  """The attack power<br>"""
+  Attack: Int!
 
   """<div>How many children the greek god had</div>"""
   Children: Int
 
-  """The attack power<br>"""
-  Attack: Int!
-
   """The defense power<br>"""
   Defense: Int!
 
-  """input skills"""
-  skills: [SpecialSkills!]
-}
+  """Attack other cards on the table , returns Cards after attack<br>"""
+  attack(
+    """Attacked card/card ids<br>"""
+    cardID: [String!]!
+  ): [Card!]
 
-""""""
-type Query {
-  """"""
-  cardById(cardId: String): Card
+  """Put your description here"""
+  cardImage: S3Object
 
-  """Draw a card<br>"""
-  drawCard: Card!
+  """Description of a card<br>"""
+  description: String!
 
   """"""
-  drawChangeCard: ChangeCard!
-
-  """list All Cards availble<br>"""
-  listCards: [Card!]!
+  id: ID!
 
   """"""
-  myStacks: [CardStack!]
+  image: String!
 
   """"""
-  nameables: [Nameable!]!
+  info: JSON!
+
+  """The name of a card<br>"""
+  name: String!
 
   """"""
-  public: Public
+  skills: [SpecialSkills!]
 }
 
-"""Aws S3 File"""
-type S3Object {
+""""""
+interface Nameable {
   """"""
-  bucket: String!
+  name: String!
+}
 
-  """"""
-  key: String!
+""""""
+scalar JSON
 
+""""""
+type Powerup {
   """"""
-  region: String!
+  name: String
 }
 
 """"""
@@ -97,49 +85,43 @@ type Mutation {
   addCard(card: createCard!): Card!
 }
 
+"""Stack of cards"""
+type CardStack implements Nameable {
+  """"""
+  cards: [Card!]
+
+  """"""
+  name: String!
+}
+
 """"""
 type Public {
   """"""
   powerups(filter: String!): [Powerup!]
 }
 
-"""Card used in card game<br>"""
-type Card implements Nameable {
-  """The attack power<br>"""
-  Attack: Int!
-
-  """<div>How many children the greek god had</div>"""
-  Children: Int
-
-  """The defense power<br>"""
-  Defense: Int!
-
-  """Attack other cards on the table , returns Cards after attack<br>"""
-  attack(
-    """Attacked card/card ids<br>"""
-    cardID: [String!]!
-  ): [Card!]
-
-  """Put your description here"""
-  cardImage: S3Object
+""""""
+type Query {
+  """"""
+  cardById(cardId: String): Card
 
-  """Description of a card<br>"""
-  description: String!
+  """Draw a card<br>"""
+  drawCard: Card!
 
   """"""
-  id: ID!
+  drawChangeCard: ChangeCard!
 
-  """"""
-  image: String!
+  """list All Cards availble<br>"""
+  listCards: [Card!]!
 
   """"""
-  info: JSON!
+  myStacks: [CardStack!]
 
-  """The name of a card<br>"""
-  name: String!
+  """"""
+  nameables: [Nameable!]!
 
   """"""
-  skills: [SpecialSkills!]
+  public: Public
 }
 
 """"""
@@ -148,25 +130,43 @@ type Subscription {
   deck: [Card!]
 }
 
-"""Stack of cards"""
-type CardStack implements Nameable {
+""""""
+type SpecialCard implements Nameable {
   """"""
-  cards: [Card!]
+  effect: String!
 
   """"""
   name: String!
 }
 
 """"""
-enum SpecialSkills {
-  """Lower enemy defense -5<br>"""
-  THUNDER
+type EffectCard implements Nameable {
+  """"""
+  effectSize: Float!
 
-  """Attack multiple Cards at once<br>"""
-  RAIN
+  """"""
+  name: String!
+}
 
-  """50% chance to avoid any attack<br>"""
-  FIRE
+"""create card inputs<br>"""
+input createCard {
+  """The name of a card<br>"""
+  name: String!
+
+  """Description of a card<br>"""
+  description: String!
+
+  """<div>How many children the greek god had</div>"""
+  Children: Int
+
+  """The attack power<br>"""
+  Attack: Int!
+
+  """The defense power<br>"""
+  Defense: Int!
+
+  """input skills"""
+  skills: [SpecialSkills!]
 }
 schema{
 	query: Query,
diff --git a/packages/graphql-zeus-core/TreeToTS/functions/generated.ts b/packages/graphql-zeus-core/TreeToTS/functions/generated.ts
index a7b4a76..c46f258 100644
--- a/packages/graphql-zeus-core/TreeToTS/functions/generated.ts
+++ b/packages/graphql-zeus-core/TreeToTS/functions/generated.ts
@@ -774,11 +774,18 @@ export type Variable<T extends GraphQLVariableType, Name extends string> = {
   ' __zeus_type': T;
 };
 
+export type ExtractVariablesDeep<Query> = Query extends Variable<infer VType, infer VName>
+  ? { [key in VName]: GetVariableType<VType> }
+  : Query extends string | number | boolean | Array<string | number | boolean>
+  ? // eslint-disable-next-line @typescript-eslint/ban-types
+    {}
+  : UnionToIntersection<{ [K in keyof Query]: WithOptionalNullables<ExtractVariablesDeep<Query[K]>> }[keyof Query]>;
+
 export type ExtractVariables<Query> = Query extends Variable<infer VType, infer VName>
   ? { [key in VName]: GetVariableType<VType> }
   : Query extends [infer Inputs, infer Outputs]
-  ? ExtractVariables<Inputs> & ExtractVariables<Outputs>
-  : Query extends string | number | boolean
+  ? ExtractVariablesDeep<Inputs> & ExtractVariables<Outputs>
+  : Query extends string | number | boolean | Array<string | number | boolean>
   ? // eslint-disable-next-line @typescript-eslint/ban-types
     {}
   : UnionToIntersection<{ [K in keyof Query]: WithOptionalNullables<ExtractVariables<Query[K]>> }[keyof Query]>;
diff --git a/packages/graphql-zeus-core/TreeToTS/functions/new/variableExtract.ts b/packages/graphql-zeus-core/TreeToTS/functions/new/variableExtract.ts
index 286519f..4115d93 100644
--- a/packages/graphql-zeus-core/TreeToTS/functions/new/variableExtract.ts
+++ b/packages/graphql-zeus-core/TreeToTS/functions/new/variableExtract.ts
@@ -5,11 +5,18 @@ export type Variable<T extends GraphQLVariableType, Name extends string> = {
   ' __zeus_type': T;
 };
 
+export type ExtractVariablesDeep<Query> = Query extends Variable<infer VType, infer VName>
+  ? { [key in VName]: GetVariableType<VType> }
+  : Query extends string | number | boolean | Array<string | number | boolean>
+  ? // eslint-disable-next-line @typescript-eslint/ban-types
+    {}
+  : UnionToIntersection<{ [K in keyof Query]: WithOptionalNullables<ExtractVariablesDeep<Query[K]>> }[keyof Query]>;
+
 export type ExtractVariables<Query> = Query extends Variable<infer VType, infer VName>
   ? { [key in VName]: GetVariableType<VType> }
   : Query extends [infer Inputs, infer Outputs]
-  ? ExtractVariables<Inputs> & ExtractVariables<Outputs>
-  : Query extends string | number | boolean
+  ? ExtractVariablesDeep<Inputs> & ExtractVariables<Outputs>
+  : Query extends string | number | boolean | Array<string | number | boolean>
   ? // eslint-disable-next-line @typescript-eslint/ban-types
     {}
   : UnionToIntersection<{ [K in keyof Query]: WithOptionalNullables<ExtractVariables<Query[K]>> }[keyof Query]>;
diff --git a/packages/graphql-zeus-core/package.json b/packages/graphql-zeus-core/package.json
index 69e205b..a647632 100644
--- a/packages/graphql-zeus-core/package.json
+++ b/packages/graphql-zeus-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-zeus-core",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "private": false,
   "main": "./lib/index.js",
   "author": "GraphQL Editor, Artur Czemiel",
diff --git a/packages/graphql-zeus-jsonschema/package.json b/packages/graphql-zeus-jsonschema/package.json
index b9887cb..6d2b205 100644
--- a/packages/graphql-zeus-jsonschema/package.json
+++ b/packages/graphql-zeus-jsonschema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-zeus-jsonschema",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "private": false,
   "main": "./lib/index.js",
   "author": "GraphQL Editor, Artur Czemiel",
diff --git a/packages/graphql-zeus/package.json b/packages/graphql-zeus/package.json
index 81bc6a4..2297272 100644
--- a/packages/graphql-zeus/package.json
+++ b/packages/graphql-zeus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-zeus",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "private": false,
   "scripts": {
     "start": "ttsc --build tsconfig.build.json --watch",
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "cross-fetch": "^3.0.4",
-    "graphql-zeus-core": "^5.3.2",
-    "graphql-zeus-jsonschema": "^5.3.2",
+    "graphql-zeus-core": "^5.3.3",
+    "graphql-zeus-jsonschema": "^5.3.3",
     "yargs": "^16.1.1"
   }
 }