diff --git a/aidedejeu_flutter/lib/models/filters.dart b/aidedejeu_flutter/lib/models/filters.dart
index 9bc92177..da301ab6 100644
--- a/aidedejeu_flutter/lib/models/filters.dart
+++ b/aidedejeu_flutter/lib/models/filters.dart
@@ -1,10 +1,11 @@
 
 import 'package:flutter/material.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 enum FilterType {
   Choices, Range
 }
-class Filter {
+class Filter extends JsonSerializable {
   String name;
   String displayName;
   FilterType type;
diff --git a/aidedejeu_flutter/lib/models/items.dart b/aidedejeu_flutter/lib/models/items.dart
index 465ac9ae..81279c54 100644
--- a/aidedejeu_flutter/lib/models/items.dart
+++ b/aidedejeu_flutter/lib/models/items.dart
@@ -1,11 +1,21 @@
 import 'package:aidedejeu_flutter/models/filters.dart';
+import 'package:json_annotation/json_annotation.dart';
 
+part 'items.g.dart';
+
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class Item {
+  @JsonKey(name: "Id")
   String id;
+  @JsonKey(name: "RootId")
   String rootId;
+  @JsonKey(name: "ParentLink")
   String parentLink;
+  @JsonKey(name: "Name")
   String name;
+  @JsonKey(name: "NormalizedName")
   String normalizedName;
+  @JsonKey(name: "ParentName")
   String parentName;
   int nameLevel;
   String alias;
@@ -17,6 +27,9 @@ class Item {
   String itemType;
   List<Item> children;
 
+
+Item();
+/*
   Item(Map<String, dynamic> map) {
     this.id = map["Id"];
     this.rootId = map["RootId"];
@@ -26,8 +39,19 @@ class Item {
     this.markdown = map["Markdown"];
     this.itemType = map["ItemType"];
   }
+*/
+  factory Item.fromJson(Map<String, dynamic> map) => _$ItemFromJson(map);
+  Map<String, dynamic> toJson() => _$ItemToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
+class GenericItem extends Item {
+  GenericItem();
+  factory GenericItem.fromJson(Map<String, dynamic> map) => _$GenericItemFromJson(map);
+  Map<String, dynamic> toJson() => _$GenericItemToJson(this);
+}
+
+@JsonSerializable(explicitToJson: true)
 class MonsterItem extends Item {
   String family;
   String type;
@@ -55,6 +79,9 @@ class MonsterItem extends Item {
   String challenge;
   int xp;
 
+  MonsterItem();
+
+/*
   MonsterItem(Map<String, dynamic> map) : super(map) {
     this.family = map["Family"];
     this.type = map["Type"];
@@ -82,8 +109,12 @@ class MonsterItem extends Item {
     this.challenge = map["Challenge"];
     this.xp = map["XP"];
   }
+  */
+  factory MonsterItem.fromJson(Map<String, dynamic> map) => _$MonsterItemFromJson(map);
+  Map<String, dynamic> toJson() => _$MonsterItemToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class SpellItem extends Item {
   String family;
   String level;
@@ -99,7 +130,8 @@ class SpellItem extends Item {
   String duration;
   String classes;
 
-  SpellItem(Map<String, dynamic> map) : super(map) {
+  SpellItem();
+/*  SpellItem(Map<String, dynamic> map) : super(map) {
     this.family = map["Family"];
     this.level = map["Level"];
     this.type = map["Type"];
@@ -113,31 +145,57 @@ class SpellItem extends Item {
     this.concentration = map["Concentration"];
     this.duration = map["Duration"];
     this.classes = map["Classes"];
-  }
+  }*/
+  factory SpellItem.fromJson(Map<String, dynamic> map) => _$SpellItemFromJson(map);
+  Map<String, dynamic> toJson() => _$SpellItemToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class Items extends Item {
-  Items(Map<String, dynamic> map) : super(map);
+  Items();
+//  Items(Map<String, dynamic> map) : super(map);
+  factory Items.fromJson(Map<String, dynamic> map) => _$ItemsFromJson(map);
+  Map<String, dynamic> toJson() => _$ItemsToJson(this);
 }
 
-abstract class FilteredItems extends Items {
+@JsonSerializable(explicitToJson: true)
+class FilteredItems extends Items {
   String family;
 
-  FilteredItems(Map<String, dynamic> map) : super(map) {
-    this.family = map["Family"];
-  }
+  FilteredItems();
 
-  List<Filter> toFilterList();
+/*  FilteredItems(Map<String, dynamic> map) : super(map) {
+    this.family = map["Family"];
+  }*/
+
+  List<Filter> toFilterList() => [].toList();
+
+  factory FilteredItems.fromJson(Map<String, dynamic> map) => _$FilteredItemsFromJson(map);
+  Map<String, dynamic> toJson() => _$FilteredItemsToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class MonsterItems extends FilteredItems {
+  String typesString;
+  String challengesString;
+  String sizesString;
+  String sourcesString;
+  String terrainsString;
+
+  @JsonKey(ignore: true)
   Filter types;
+  @JsonKey(ignore: true)
   Filter challenges;
+  @JsonKey(ignore: true)
   Filter sizes;
+  @JsonKey(ignore: true)
   Filter sources;
+  @JsonKey(ignore: true)
   Filter terrains;
 
-  MonsterItems(Map<String, dynamic> map) : super(map) {
+  MonsterItems();
+
+/*  MonsterItems(Map<String, dynamic> map) : super(map) {
     this.types = Filter(
         name: "Types",
         displayName: "monstersTypes",
@@ -164,7 +222,7 @@ class MonsterItems extends FilteredItems {
         type: FilterType.Choices,
         values: map["Terrains"].toString().split("|"));
   }
-
+*/
   List<Filter> toFilterList() => {
         types,
         challenges,
@@ -172,23 +230,41 @@ class MonsterItems extends FilteredItems {
         sources,
         terrains,
       }.toList();
+
+  factory MonsterItems.fromJson(Map<String, dynamic> map) => _$MonsterItemsFromJson(map);
+  Map<String, dynamic> toJson() => _$MonsterItemsToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class SpellItems extends FilteredItems {
+  @JsonKey(ignore: true)
   Filter classes;
+  @JsonKey(ignore: true)
   Filter levels;
+  @JsonKey(ignore: true)
   Filter schools;
+  @JsonKey(ignore: true)
   Filter rituals;
+  @JsonKey(ignore: true)
   Filter castingTimes;
+  @JsonKey(ignore: true)
   Filter ranges;
+  @JsonKey(ignore: true)
   Filter verbalComponents;
+  @JsonKey(ignore: true)
   Filter somaticComponents;
+  @JsonKey(ignore: true)
   Filter materialComponents;
+  @JsonKey(ignore: true)
   Filter concentrations;
+  @JsonKey(ignore: true)
   Filter durations;
+  @JsonKey(ignore: true)
   Filter sources;
 
-  SpellItems(Map<String, dynamic> map) : super(map) {
+  SpellItems();
+
+/*  SpellItems(Map<String, dynamic> map) : super(map) {
     this.classes = Filter(
         name: "Classes",
         displayName: "spellsClasses",
@@ -250,7 +326,7 @@ class SpellItems extends FilteredItems {
         type: FilterType.Choices,
         values: map["Sources"].toString().split("|"));
   }
-
+*/
   List<Filter> toFilterList() => {
         classes,
         levels,
@@ -265,8 +341,12 @@ class SpellItems extends FilteredItems {
         durations,
         sources,
       }.toList();
+
+  factory SpellItems.fromJson(Map<String, dynamic> map) => _$SpellItemsFromJson(map);
+  Map<String, dynamic> toJson() => _$SpellItemsToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class RaceItem extends Item {
   String fullName;
   bool hasSubRaces;
@@ -291,7 +371,9 @@ class RaceItem extends Item {
   String darkvision;
   String languages;
 
-  RaceItem(Map<String, dynamic> map) : super(map) {
+  RaceItem();
+
+/*  RaceItem(Map<String, dynamic> map) : super(map) {
     this.fullName = map["FullName"];
     this.hasSubRaces = map["HasSubRaces"] == "true";
     this.strengthBonus = map["StrengthBonus"];
@@ -314,93 +396,127 @@ class RaceItem extends Item {
     this.speed = map["Speed"];
     this.darkvision = map["Darkvision"];
     this.languages = map["Languages"];
-  }
+  }*/
+  factory RaceItem.fromJson(Map<String, dynamic> map) => _$RaceItemFromJson(map);
+  Map<String, dynamic> toJson() => _$RaceItemToJson(this);
+
 }
 
+@JsonSerializable(explicitToJson: true)
 class SubRaceItem extends RaceItem {
   String parentRaceId;
 
-  SubRaceItem(Map<String, dynamic> map) : super(map) {
+  SubRaceItem();
+
+/*  SubRaceItem(Map<String, dynamic> map) : super(map) {
     this.parentRaceId = map["ParentRaceId"];
-  }
+  }*/
+  factory SubRaceItem.fromJson(Map<String, dynamic> map) => _$SubRaceItemFromJson(map);
+  Map<String, dynamic> toJson() => _$SubRaceItemToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class RaceItems extends FilteredItems {
-  RaceItems(Map<String, dynamic> map) : super(map);
+//  RaceItems(Map<String, dynamic> map) : super(map);
+
+  RaceItems();
 
   @override
   List<Filter> toFilterList() {
     return [].toList();
   }
+  factory RaceItems.fromJson(Map<String, dynamic> map) => _$RaceItemsFromJson(map);
+  Map<String, dynamic> toJson() => _$RaceItemsToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class OriginItem extends Item {
   String regionsOfOrigin;
   String mainLanguages;
   String aspirations;
   String availableSkills;
 
-  OriginItem(Map<String, dynamic> map) : super(map) {
+  OriginItem();
+
+/*  OriginItem(Map<String, dynamic> map) : super(map) {
     this.regionsOfOrigin = map["RegionsOfOrigin"];
     this.mainLanguages = map["MainLanguages"];
     this.aspirations = map["Aspirations"];
     this.availableSkills = map["AvailableSkills"];
-  }
+  }*/
+  factory OriginItem.fromJson(Map<String, dynamic> map) => _$OriginItemFromJson(map);
+  Map<String, dynamic> toJson() => _$OriginItemToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class OriginItems extends FilteredItems {
-  OriginItems(Map<String, dynamic> map) : super(map);
+//  OriginItems(Map<String, dynamic> map) : super(map);
+
+  OriginItems();
 
   @override
   List<Filter> toFilterList() {
     return [].toList();
   }
+  factory OriginItems.fromJson(Map<String, dynamic> map) => _$OriginItemsFromJson(map);
+  Map<String, dynamic> toJson() => _$OriginItemsToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class BackgroundItem extends Item {
   String skillProficiencies;
   String masteredTools;
   String masteredLanguages;
   String equipment;
 
+  BackgroundItem();
+/*
   BackgroundItem(Map<String, dynamic> map) : super(map) {
     this.skillProficiencies = map["SkillProficiencies"];
     this.masteredTools = map["MasteredTools"];
     this.masteredLanguages = map["MasteredLanguages"];
     this.equipment = map["Equipment"];
-  }
+  }*/
+  factory BackgroundItem.fromJson(Map<String, dynamic> map) => _$BackgroundItemFromJson(map);
+  Map<String, dynamic> toJson() => _$BackgroundItemToJson(this);
 }
 
+@JsonSerializable(explicitToJson: true)
 class SubBackgroundItem extends BackgroundItem {
-  SubBackgroundItem(Map<String, dynamic> map) : super(map);
+  SubBackgroundItem();
+//  SubBackgroundItem(Map<String, dynamic> map) : super(map);
+  factory SubBackgroundItem.fromJson(Map<String, dynamic> map) => _$SubBackgroundItemFromJson(map);
+  Map<String, dynamic> toJson() => _$SubBackgroundItemToJson(this);
 }
 
 Item itemFromMap(Map<String, dynamic> map) {
   switch (map["ItemType"]) {
+    case "GenericItem":
+      return GenericItem.fromJson(map);
     case "RaceItem":
-      return RaceItem(map);
+      return RaceItem.fromJson(map);
     case "SubRaceItem":
-      return SubRaceItem(map);
+      return SubRaceItem.fromJson(map);
     case "RaceItems":
-      return RaceItems(map);
+      return RaceItems.fromJson(map);
     case "OriginItem":
-      return OriginItem(map);
+      return OriginItem.fromJson(map);
     case "OriginItems":
-      return OriginItems(map);
+      return OriginItems.fromJson(map);
     case "BackgroundItem":
-      return BackgroundItem(map);
+      return BackgroundItem.fromJson(map);
     case "SubBackgroundItem":
-      return SubBackgroundItem(map);
+      return SubBackgroundItem.fromJson(map);
     case "MonsterItem":
-      return MonsterItem(map);
+      return MonsterItem.fromJson(map);
     case "MonsterItems":
-      return MonsterItems(map);
+      return MonsterItems.fromJson(map);
     case "SpellItem":
-      return SpellItem(map);
+      return SpellItem.fromJson(map);
     case "SpellItems":
-      return SpellItems(map);
+      return SpellItems.fromJson(map);
   }
-  return Item(map);
+  return Item.fromJson(map);
 }
 
 List<T> itemsFromMapList<T extends Item>(List<Map<String, dynamic>> mapList) {
diff --git a/aidedejeu_flutter/lib/models/items.g.dart b/aidedejeu_flutter/lib/models/items.g.dart
new file mode 100644
index 00000000..3751b9f3
--- /dev/null
+++ b/aidedejeu_flutter/lib/models/items.g.dart
@@ -0,0 +1,833 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'items.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Item _$ItemFromJson(Map<String, dynamic> json) {
+  return Item()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList();
+}
+
+Map<String, dynamic> _$ItemToJson(Item instance) => <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+    };
+
+GenericItem _$GenericItemFromJson(Map<String, dynamic> json) {
+  return GenericItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList();
+}
+
+Map<String, dynamic> _$GenericItemToJson(GenericItem instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+    };
+
+MonsterItem _$MonsterItemFromJson(Map<String, dynamic> json) {
+  return MonsterItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..family = json['family'] as String
+    ..type = json['type'] as String
+    ..size = json['size'] as String
+    ..alignment = json['alignment'] as String
+    ..terrain = json['terrain'] as String
+    ..legendary = json['legendary'] as String
+    ..armorClass = json['armorClass'] as String
+    ..hitPoints = json['hitPoints'] as String
+    ..speed = json['speed'] as String
+    ..strength = json['strength'] as String
+    ..dexterity = json['dexterity'] as String
+    ..constitution = json['constitution'] as String
+    ..intelligence = json['intelligence'] as String
+    ..wisdom = json['wisdom'] as String
+    ..charisma = json['charisma'] as String
+    ..savingThrows = json['savingThrows'] as String
+    ..skills = json['skills'] as String
+    ..damageVulnerabilities = json['damageVulnerabilities'] as String
+    ..damageImmunities = json['damageImmunities'] as String
+    ..conditionImmunities = json['conditionImmunities'] as String
+    ..damageResistances = json['damageResistances'] as String
+    ..senses = json['senses'] as String
+    ..languages = json['languages'] as String
+    ..challenge = json['challenge'] as String
+    ..xp = json['xp'] as int;
+}
+
+Map<String, dynamic> _$MonsterItemToJson(MonsterItem instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'family': instance.family,
+      'type': instance.type,
+      'size': instance.size,
+      'alignment': instance.alignment,
+      'terrain': instance.terrain,
+      'legendary': instance.legendary,
+      'armorClass': instance.armorClass,
+      'hitPoints': instance.hitPoints,
+      'speed': instance.speed,
+      'strength': instance.strength,
+      'dexterity': instance.dexterity,
+      'constitution': instance.constitution,
+      'intelligence': instance.intelligence,
+      'wisdom': instance.wisdom,
+      'charisma': instance.charisma,
+      'savingThrows': instance.savingThrows,
+      'skills': instance.skills,
+      'damageVulnerabilities': instance.damageVulnerabilities,
+      'damageImmunities': instance.damageImmunities,
+      'conditionImmunities': instance.conditionImmunities,
+      'damageResistances': instance.damageResistances,
+      'senses': instance.senses,
+      'languages': instance.languages,
+      'challenge': instance.challenge,
+      'xp': instance.xp,
+    };
+
+SpellItem _$SpellItemFromJson(Map<String, dynamic> json) {
+  return SpellItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..family = json['family'] as String
+    ..level = json['level'] as String
+    ..type = json['type'] as String
+    ..ritual = json['ritual'] as String
+    ..castingTime = json['castingTime'] as String
+    ..range = json['range'] as String
+    ..components = json['components'] as String
+    ..verbalComponent = json['verbalComponent'] as String
+    ..somaticComponent = json['somaticComponent'] as String
+    ..materialComponent = json['materialComponent'] as String
+    ..concentration = json['concentration'] as String
+    ..duration = json['duration'] as String
+    ..classes = json['classes'] as String;
+}
+
+Map<String, dynamic> _$SpellItemToJson(SpellItem instance) => <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'family': instance.family,
+      'level': instance.level,
+      'type': instance.type,
+      'ritual': instance.ritual,
+      'castingTime': instance.castingTime,
+      'range': instance.range,
+      'components': instance.components,
+      'verbalComponent': instance.verbalComponent,
+      'somaticComponent': instance.somaticComponent,
+      'materialComponent': instance.materialComponent,
+      'concentration': instance.concentration,
+      'duration': instance.duration,
+      'classes': instance.classes,
+    };
+
+Items _$ItemsFromJson(Map<String, dynamic> json) {
+  return Items()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList();
+}
+
+Map<String, dynamic> _$ItemsToJson(Items instance) => <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+    };
+
+FilteredItems _$FilteredItemsFromJson(Map<String, dynamic> json) {
+  return FilteredItems()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..family = json['family'] as String;
+}
+
+Map<String, dynamic> _$FilteredItemsToJson(FilteredItems instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'family': instance.family,
+    };
+
+MonsterItems _$MonsterItemsFromJson(Map<String, dynamic> json) {
+  return MonsterItems()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..family = json['family'] as String
+    ..typesString = json['typesString'] as String
+    ..challengesString = json['challengesString'] as String
+    ..sizesString = json['sizesString'] as String
+    ..sourcesString = json['sourcesString'] as String
+    ..terrainsString = json['terrainsString'] as String;
+}
+
+Map<String, dynamic> _$MonsterItemsToJson(MonsterItems instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'family': instance.family,
+      'typesString': instance.typesString,
+      'challengesString': instance.challengesString,
+      'sizesString': instance.sizesString,
+      'sourcesString': instance.sourcesString,
+      'terrainsString': instance.terrainsString,
+    };
+
+SpellItems _$SpellItemsFromJson(Map<String, dynamic> json) {
+  return SpellItems()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..family = json['family'] as String;
+}
+
+Map<String, dynamic> _$SpellItemsToJson(SpellItems instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'family': instance.family,
+    };
+
+RaceItem _$RaceItemFromJson(Map<String, dynamic> json) {
+  return RaceItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..fullName = json['fullName'] as String
+    ..hasSubRaces = json['hasSubRaces'] as bool
+    ..strengthBonus = json['strengthBonus'] as String
+    ..dexterityBonus = json['dexterityBonus'] as String
+    ..constitutionBonus = json['constitutionBonus'] as String
+    ..intelligenceBonus = json['intelligenceBonus'] as String
+    ..wisdomBonus = json['wisdomBonus'] as String
+    ..charismaBonus = json['charismaBonus'] as String
+    ..dispatchedBonus = json['dispatchedBonus'] as String
+    ..maxDispatchedStrengthBonus = json['maxDispatchedStrengthBonus'] as String
+    ..maxDispatchedDexterityBonus =
+        json['maxDispatchedDexterityBonus'] as String
+    ..maxDispatchedConstitutionBonus =
+        json['maxDispatchedConstitutionBonus'] as String
+    ..maxDispatchedIntelligenceBonus =
+        json['maxDispatchedIntelligenceBonus'] as String
+    ..maxDispatchedWisdomBonus = json['maxDispatchedWisdomBonus'] as String
+    ..maxDispatchedCharismaBonus = json['maxDispatchedCharismaBonus'] as String
+    ..abilityScoreIncrease = json['abilityScoreIncrease'] as String
+    ..age = json['age'] as String
+    ..alignment = json['alignment'] as String
+    ..size = json['size'] as String
+    ..speed = json['speed'] as String
+    ..darkvision = json['darkvision'] as String
+    ..languages = json['languages'] as String;
+}
+
+Map<String, dynamic> _$RaceItemToJson(RaceItem instance) => <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'fullName': instance.fullName,
+      'hasSubRaces': instance.hasSubRaces,
+      'strengthBonus': instance.strengthBonus,
+      'dexterityBonus': instance.dexterityBonus,
+      'constitutionBonus': instance.constitutionBonus,
+      'intelligenceBonus': instance.intelligenceBonus,
+      'wisdomBonus': instance.wisdomBonus,
+      'charismaBonus': instance.charismaBonus,
+      'dispatchedBonus': instance.dispatchedBonus,
+      'maxDispatchedStrengthBonus': instance.maxDispatchedStrengthBonus,
+      'maxDispatchedDexterityBonus': instance.maxDispatchedDexterityBonus,
+      'maxDispatchedConstitutionBonus': instance.maxDispatchedConstitutionBonus,
+      'maxDispatchedIntelligenceBonus': instance.maxDispatchedIntelligenceBonus,
+      'maxDispatchedWisdomBonus': instance.maxDispatchedWisdomBonus,
+      'maxDispatchedCharismaBonus': instance.maxDispatchedCharismaBonus,
+      'abilityScoreIncrease': instance.abilityScoreIncrease,
+      'age': instance.age,
+      'alignment': instance.alignment,
+      'size': instance.size,
+      'speed': instance.speed,
+      'darkvision': instance.darkvision,
+      'languages': instance.languages,
+    };
+
+SubRaceItem _$SubRaceItemFromJson(Map<String, dynamic> json) {
+  return SubRaceItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..fullName = json['fullName'] as String
+    ..hasSubRaces = json['hasSubRaces'] as bool
+    ..strengthBonus = json['strengthBonus'] as String
+    ..dexterityBonus = json['dexterityBonus'] as String
+    ..constitutionBonus = json['constitutionBonus'] as String
+    ..intelligenceBonus = json['intelligenceBonus'] as String
+    ..wisdomBonus = json['wisdomBonus'] as String
+    ..charismaBonus = json['charismaBonus'] as String
+    ..dispatchedBonus = json['dispatchedBonus'] as String
+    ..maxDispatchedStrengthBonus = json['maxDispatchedStrengthBonus'] as String
+    ..maxDispatchedDexterityBonus =
+        json['maxDispatchedDexterityBonus'] as String
+    ..maxDispatchedConstitutionBonus =
+        json['maxDispatchedConstitutionBonus'] as String
+    ..maxDispatchedIntelligenceBonus =
+        json['maxDispatchedIntelligenceBonus'] as String
+    ..maxDispatchedWisdomBonus = json['maxDispatchedWisdomBonus'] as String
+    ..maxDispatchedCharismaBonus = json['maxDispatchedCharismaBonus'] as String
+    ..abilityScoreIncrease = json['abilityScoreIncrease'] as String
+    ..age = json['age'] as String
+    ..alignment = json['alignment'] as String
+    ..size = json['size'] as String
+    ..speed = json['speed'] as String
+    ..darkvision = json['darkvision'] as String
+    ..languages = json['languages'] as String
+    ..parentRaceId = json['parentRaceId'] as String;
+}
+
+Map<String, dynamic> _$SubRaceItemToJson(SubRaceItem instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'fullName': instance.fullName,
+      'hasSubRaces': instance.hasSubRaces,
+      'strengthBonus': instance.strengthBonus,
+      'dexterityBonus': instance.dexterityBonus,
+      'constitutionBonus': instance.constitutionBonus,
+      'intelligenceBonus': instance.intelligenceBonus,
+      'wisdomBonus': instance.wisdomBonus,
+      'charismaBonus': instance.charismaBonus,
+      'dispatchedBonus': instance.dispatchedBonus,
+      'maxDispatchedStrengthBonus': instance.maxDispatchedStrengthBonus,
+      'maxDispatchedDexterityBonus': instance.maxDispatchedDexterityBonus,
+      'maxDispatchedConstitutionBonus': instance.maxDispatchedConstitutionBonus,
+      'maxDispatchedIntelligenceBonus': instance.maxDispatchedIntelligenceBonus,
+      'maxDispatchedWisdomBonus': instance.maxDispatchedWisdomBonus,
+      'maxDispatchedCharismaBonus': instance.maxDispatchedCharismaBonus,
+      'abilityScoreIncrease': instance.abilityScoreIncrease,
+      'age': instance.age,
+      'alignment': instance.alignment,
+      'size': instance.size,
+      'speed': instance.speed,
+      'darkvision': instance.darkvision,
+      'languages': instance.languages,
+      'parentRaceId': instance.parentRaceId,
+    };
+
+RaceItems _$RaceItemsFromJson(Map<String, dynamic> json) {
+  return RaceItems()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..family = json['family'] as String;
+}
+
+Map<String, dynamic> _$RaceItemsToJson(RaceItems instance) => <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'family': instance.family,
+    };
+
+OriginItem _$OriginItemFromJson(Map<String, dynamic> json) {
+  return OriginItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..regionsOfOrigin = json['regionsOfOrigin'] as String
+    ..mainLanguages = json['mainLanguages'] as String
+    ..aspirations = json['aspirations'] as String
+    ..availableSkills = json['availableSkills'] as String;
+}
+
+Map<String, dynamic> _$OriginItemToJson(OriginItem instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'regionsOfOrigin': instance.regionsOfOrigin,
+      'mainLanguages': instance.mainLanguages,
+      'aspirations': instance.aspirations,
+      'availableSkills': instance.availableSkills,
+    };
+
+OriginItems _$OriginItemsFromJson(Map<String, dynamic> json) {
+  return OriginItems()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..family = json['family'] as String;
+}
+
+Map<String, dynamic> _$OriginItemsToJson(OriginItems instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'family': instance.family,
+    };
+
+BackgroundItem _$BackgroundItemFromJson(Map<String, dynamic> json) {
+  return BackgroundItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..skillProficiencies = json['skillProficiencies'] as String
+    ..masteredTools = json['masteredTools'] as String
+    ..masteredLanguages = json['masteredLanguages'] as String
+    ..equipment = json['equipment'] as String;
+}
+
+Map<String, dynamic> _$BackgroundItemToJson(BackgroundItem instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'skillProficiencies': instance.skillProficiencies,
+      'masteredTools': instance.masteredTools,
+      'masteredLanguages': instance.masteredLanguages,
+      'equipment': instance.equipment,
+    };
+
+SubBackgroundItem _$SubBackgroundItemFromJson(Map<String, dynamic> json) {
+  return SubBackgroundItem()
+    ..id = json['Id'] as String
+    ..rootId = json['RootId'] as String
+    ..parentLink = json['ParentLink'] as String
+    ..name = json['Name'] as String
+    ..normalizedName = json['NormalizedName'] as String
+    ..parentName = json['ParentName'] as String
+    ..nameLevel = json['NameLevel'] as int
+    ..alias = json['Alias'] as String
+    ..aliasText = json['AliasText'] as String
+    ..normalizedAlias = json['NormalizedAlias'] as String
+    ..source = json['Source'] as String
+    ..markdown = json['Markdown'] as String
+    ..fullText = json['FullText'] as String
+    ..itemType = json['ItemType'] as String
+    ..children = (json['Children'] as List)
+        ?.map(
+            (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..skillProficiencies = json['skillProficiencies'] as String
+    ..masteredTools = json['masteredTools'] as String
+    ..masteredLanguages = json['masteredLanguages'] as String
+    ..equipment = json['equipment'] as String;
+}
+
+Map<String, dynamic> _$SubBackgroundItemToJson(SubBackgroundItem instance) =>
+    <String, dynamic>{
+      'Id': instance.id,
+      'RootId': instance.rootId,
+      'ParentLink': instance.parentLink,
+      'Name': instance.name,
+      'NormalizedName': instance.normalizedName,
+      'ParentName': instance.parentName,
+      'NameLevel': instance.nameLevel,
+      'Alias': instance.alias,
+      'AliasText': instance.aliasText,
+      'NormalizedAlias': instance.normalizedAlias,
+      'Source': instance.source,
+      'Markdown': instance.markdown,
+      'FullText': instance.fullText,
+      'ItemType': instance.itemType,
+      'Children': instance.children?.map((e) => e?.toJson())?.toList(),
+      'skillProficiencies': instance.skillProficiencies,
+      'masteredTools': instance.masteredTools,
+      'masteredLanguages': instance.masteredLanguages,
+      'equipment': instance.equipment,
+    };
diff --git a/aidedejeu_flutter/lib/models/test.dart b/aidedejeu_flutter/lib/models/test.dart
new file mode 100644
index 00000000..82b5012c
--- /dev/null
+++ b/aidedejeu_flutter/lib/models/test.dart
@@ -0,0 +1,16 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'test.g.dart';
+
+@JsonSerializable(explicitToJson: true)
+class Test {
+  String id;
+  String rootId;
+  String parentLink;
+  String name;
+
+  Test();
+
+  factory Test.fromJson(Map<String, dynamic> map) => _$TestFromJson(map);
+  Map<String, dynamic> toJson() => _$TestToJson(this);
+}
diff --git a/aidedejeu_flutter/lib/models/test.g.dart b/aidedejeu_flutter/lib/models/test.g.dart
new file mode 100644
index 00000000..7f6c5ebb
--- /dev/null
+++ b/aidedejeu_flutter/lib/models/test.g.dart
@@ -0,0 +1,22 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'test.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Test _$TestFromJson(Map<String, dynamic> json) {
+  return Test()
+    ..id = json['id'] as String
+    ..rootId = json['rootId'] as String
+    ..parentLink = json['parentLink'] as String
+    ..name = json['name'] as String;
+}
+
+Map<String, dynamic> _$TestToJson(Test instance) => <String, dynamic>{
+      'id': instance.id,
+      'rootId': instance.rootId,
+      'parentLink': instance.parentLink,
+      'name': instance.name,
+    };
diff --git a/aidedejeu_flutter/pubspec.lock b/aidedejeu_flutter/pubspec.lock
index cb195f9c..2155028e 100644
--- a/aidedejeu_flutter/pubspec.lock
+++ b/aidedejeu_flutter/pubspec.lock
@@ -9,12 +9,12 @@ packages:
     source: hosted
     version: "6.0.0"
   analyzer:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.16"
+    version: "0.39.14"
   args:
     dependency: transitive
     description:
@@ -28,35 +28,98 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety"
+    version: "2.4.2"
   bloc:
     dependency: "direct main"
     description:
       name: bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.3"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety"
+    version: "2.0.0"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.0"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.2"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.11"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.10.0"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.2.0"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.3.2"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.2"
+    version: "1.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety"
+    version: "1.1.3"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   cli_util:
     dependency: transitive
     description:
@@ -70,14 +133,21 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety"
+    version: "1.0.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.4.1"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.2"
+    version: "1.14.13"
   convert:
     dependency: transitive
     description:
@@ -105,7 +175,7 @@ packages:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "1.0.0"
   dart_style:
     dependency: transitive
     description:
@@ -119,14 +189,21 @@ packages:
       name: equatable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.3"
+    version: "1.2.5"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety"
+    version: "1.1.0"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.11"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -138,7 +215,7 @@ packages:
       name: flutter_bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.5"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -150,14 +227,14 @@ packages:
       name: flutter_markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.4"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.18.0"
+    version: "0.19.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -170,6 +247,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   html:
     dependency: transitive
     description:
@@ -177,6 +261,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.14.0+3"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.4"
   intl:
     dependency: "direct main"
     description:
@@ -190,7 +288,14 @@ packages:
       name: intl_translation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.17.10"
+    version: "0.17.10+1"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.4"
   js:
     dependency: transitive
     description:
@@ -198,27 +303,55 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.2"
+  json_annotation:
+    dependency: "direct main"
+    description:
+      name: json_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.0"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.11.4"
   markdown:
     dependency: transitive
     description:
       name: markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.8"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety"
+    version: "0.12.8"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.2"
+    version: "1.1.8"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.7"
   nested:
     dependency: transitive
     description:
@@ -253,14 +386,14 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety"
+    version: "1.7.0"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.1+1"
   path_parsing:
     dependency: transitive
     description:
@@ -274,21 +407,28 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.2"
+    version: "1.9.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.0"
+    version: "3.0.4"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
   provider:
     dependency: transitive
     description:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2"
+    version: "4.3.2+2"
   pub_semver:
     dependency: transitive
     description:
@@ -296,32 +436,67 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.4"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.5"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
   sembast:
     dependency: "direct main"
     description:
       name: sembast
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.7+6"
+    version: "2.4.7+7"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.9"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.3"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.7+1"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety"
+    version: "1.7.0"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.1+1"
   sqflite_common:
     dependency: transitive
     description:
@@ -335,21 +510,28 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety"
+    version: "1.9.5"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety"
+    version: "2.0.0"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety"
+    version: "1.0.5"
   synchronized:
     dependency: transitive
     description:
@@ -363,28 +545,35 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety"
+    version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety"
+    version: "0.2.17"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.1+2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.2"
+    version: "1.2.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.2"
+    version: "2.0.8"
   watcher:
     dependency: transitive
     description:
@@ -392,13 +581,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.7+15"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.0"
+    version: "4.5.1"
   yaml:
     dependency: transitive
     description:
@@ -407,5 +603,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0-0.0.dev <2.10.0"
+  dart: ">=2.9.0-14.0.dev <3.0.0"
   flutter: ">=1.18.0-6.0.pre <2.0.0"
diff --git a/aidedejeu_flutter/pubspec.yaml b/aidedejeu_flutter/pubspec.yaml
index ace83760..1802511b 100644
--- a/aidedejeu_flutter/pubspec.yaml
+++ b/aidedejeu_flutter/pubspec.yaml
@@ -34,10 +34,16 @@ dependencies:
   flutter_bloc:
   cupertino_icons: # ^0.1.2
   equatable: # ^1.0.0
+  json_annotation:
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  json_serializable:
+  build_runner:
+
+dependency_overrides:
+  analyzer: '0.39.14'
 
 
 # For information on the generic Dart part of this file, see the