diff --git a/Generator/Sources/Generator/Resources/Models - The iPhone Wiki.html b/Generator/Sources/Generator/Resources/Models - The iPhone Wiki.html
index 36002c8..6f4d406 100644
--- a/Generator/Sources/Generator/Resources/Models - The iPhone Wiki.html	
+++ b/Generator/Sources/Generator/Resources/Models - The iPhone Wiki.html	
@@ -4,7 +4,7 @@
 <meta charset="UTF-8"/>
 <title>Models - The iPhone Wiki</title>
 <script>document.documentElement.className = document.documentElement.className.replace( /(^|\s)client-nojs(\s|$)/, "$1client-js$2" );</script>
-<script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgCanonicalNamespace":"","wgCanonicalSpecialPageName":false,"wgNamespaceNumber":0,"wgPageName":"Models","wgTitle":"Models","wgCurRevisionId":121837,"wgRevisionId":121837,"wgArticleId":2538,"wgIsArticle":true,"wgIsRedirect":false,"wgAction":"view","wgUserName":null,"wgUserGroups":["*"],"wgCategories":[],"wgBreakFrames":false,"wgPageContentLanguage":"en","wgPageContentModel":"wikitext","wgSeparatorTransformTable":["",""],"wgDigitTransformTable":["",""],"wgDefaultDateFormat":"dmy","wgMonthNames":["","January","February","March","April","May","June","July","August","September","October","November","December"],"wgMonthNamesShort":["","Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"wgRelevantPageName":"Models","wgRelevantArticleId":2538,"wgRequestId":"c5ba51c777f20c3e72491467","wgIsProbablyEditable":false,"wgRelevantPageIsProbablyEditable":false,"wgRestrictionEdit":[],"wgRestrictionMove":[]});mw.loader.state({"site.styles":"ready","noscript":"ready","user.styles":"ready","user":"ready","user.options":"ready","user.tokens":"loading","ext.cite.styles":"ready","mediawiki.legacy.shared":"ready","mediawiki.legacy.commonPrint":"ready","mediawiki.sectionAnchor":"ready","mediawiki.skinning.interface":"ready","skins.vector.styles":"ready"});mw.loader.implement("user.tokens@0di9npt",function($,jQuery,require,module){/*@nomin*/mw.user.tokens.set({"editToken":"+\\","patrolToken":"+\\","watchToken":"+\\","csrfToken":"+\\"});
+<script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgCanonicalNamespace":"","wgCanonicalSpecialPageName":false,"wgNamespaceNumber":0,"wgPageName":"Models","wgTitle":"Models","wgCurRevisionId":121873,"wgRevisionId":121873,"wgArticleId":2538,"wgIsArticle":true,"wgIsRedirect":false,"wgAction":"view","wgUserName":null,"wgUserGroups":["*"],"wgCategories":[],"wgBreakFrames":false,"wgPageContentLanguage":"en","wgPageContentModel":"wikitext","wgSeparatorTransformTable":["",""],"wgDigitTransformTable":["",""],"wgDefaultDateFormat":"dmy","wgMonthNames":["","January","February","March","April","May","June","July","August","September","October","November","December"],"wgMonthNamesShort":["","Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"wgRelevantPageName":"Models","wgRelevantArticleId":2538,"wgRequestId":"753f6fb8fc96a02220b75f0c","wgIsProbablyEditable":false,"wgRelevantPageIsProbablyEditable":false,"wgRestrictionEdit":[],"wgRestrictionMove":[]});mw.loader.state({"site.styles":"ready","noscript":"ready","user.styles":"ready","user":"ready","user.options":"ready","user.tokens":"loading","ext.cite.styles":"ready","mediawiki.legacy.shared":"ready","mediawiki.legacy.commonPrint":"ready","mediawiki.sectionAnchor":"ready","mediawiki.skinning.interface":"ready","skins.vector.styles":"ready"});mw.loader.implement("user.tokens@0di9npt",function($,jQuery,require,module){/*@nomin*/mw.user.tokens.set({"editToken":"+\\","patrolToken":"+\\","watchToken":"+\\","csrfToken":"+\\"});
 });mw.loader.load(["ext.cite.a11y","site","mediawiki.page.startup","mediawiki.user","mediawiki.hidpi","mediawiki.page.ready","mediawiki.toc","mediawiki.searchSuggest","ext.gadget.CommentsInLocalTime","skins.vector.js"]);});</script>
 <link rel="stylesheet" href="/w/load.php?debug=false&amp;lang=en&amp;modules=ext.cite.styles%7Cmediawiki.legacy.commonPrint%2Cshared%7Cmediawiki.sectionAnchor%7Cmediawiki.skinning.interface%7Cskins.vector.styles&amp;only=styles&amp;skin=vector"/>
 <script async="" src="/w/load.php?debug=false&amp;lang=en&amp;modules=startup&amp;only=scripts&amp;skin=vector"></script>
@@ -3507,7 +3507,7 @@ <h2><span class="mw-headline" id="iPad_Air"><a href="/wiki/List_of_iPad_Airs" ti
 </td>
 <td rowspan="10"><a href="/wiki/J407AP" title="J407AP">J407AP</a>
 </td>
-<td rowspan="10">iPad13,6
+<td rowspan="10">iPad13,16
 </td>
 <td rowspan="2">Space Gray
 </td>
@@ -3575,7 +3575,7 @@ <h2><span class="mw-headline" id="iPad_Air"><a href="/wiki/List_of_iPad_Airs" ti
 </td>
 <td rowspan="10"><a href="/wiki/J408AP" title="J408AP">J408AP</a>
 </td>
-<td rowspan="10">iPad13,7
+<td rowspan="10">iPad13,17
 </td>
 <td rowspan="2">Space Gray
 </td>
@@ -11808,11 +11808,11 @@ <h2><span class="mw-headline" id="Notes">Notes</span></h2>
 
 <!-- 
 NewPP limit report
-Cached time: 20220316173659
+Cached time: 20220322184418
 Cache expiry: 86400
 Dynamic content: false
-CPU time usage: 0.498 seconds
-Real time usage: 0.500 seconds
+CPU time usage: 0.526 seconds
+Real time usage: 0.517 seconds
 Preprocessor visited node count: 611/1000000
 Preprocessor generated node count: 1468/1000000
 Post‐expand include size: 141/2097152 bytes
@@ -11824,15 +11824,15 @@ <h2><span class="mw-headline" id="Notes">Notes</span></h2>
 -->
 <!--
 Transclusion expansion time report (%,ms,calls,template)
-100.00%    1.969      1 -total
- 52.41%    1.032      1 Template:Main
- 40.48%    0.797      1 Template:Float_toc
+100.00%    2.098      1 -total
+ 52.81%    1.108      1 Template:Main
+ 40.52%    0.850      1 Template:Float_toc
 -->
 </div>
-<!-- Saved in parser cache with key theiphon_wikidb:pcache:idhash:2538-0!canonical and timestamp 20220316173705 and revision id 121837
+<!-- Saved in parser cache with key theiphon_wikidb:pcache:idhash:2538-0!canonical and timestamp 20220322184429 and revision id 121873
  -->
 </div>					<div class="printfooter">
-						Retrieved from "<a dir="ltr" href="https://www.theiphonewiki.com/w/index.php?title=Models&amp;oldid=121837">https://www.theiphonewiki.com/w/index.php?title=Models&amp;oldid=121837</a>"					</div>
+						Retrieved from "<a dir="ltr" href="https://www.theiphonewiki.com/w/index.php?title=Models&amp;oldid=121873">https://www.theiphonewiki.com/w/index.php?title=Models&amp;oldid=121873</a>"					</div>
 				<div id="catlinks" class="catlinks catlinks-allhidden" data-mw="interface"></div>				<div class="visualClear"></div>
 							</div>
 		</div>
@@ -11906,14 +11906,14 @@ <h3 id="p-Miscellaneous-label">Miscellaneous</h3>
 			<h3 id="p-tb-label">Tools</h3>
 			<div class="body">
 								<ul>
-					<li id="t-whatlinkshere"><a href="/wiki/Special:WhatLinksHere/Models" title="A list of all wiki pages that link here [j]" accesskey="j">What links here</a></li><li id="t-recentchangeslinked"><a href="/wiki/Special:RecentChangesLinked/Models" rel="nofollow" title="Recent changes in pages linked from this page [k]" accesskey="k">Related changes</a></li><li id="t-specialpages"><a href="/wiki/Special:SpecialPages" title="A list of all special pages [q]" accesskey="q">Special pages</a></li><li id="t-print"><a href="/w/index.php?title=Models&amp;printable=yes" rel="alternate" title="Printable version of this page [p]" accesskey="p">Printable version</a></li><li id="t-permalink"><a href="/w/index.php?title=Models&amp;oldid=121837" title="Permanent link to this revision of the page">Permanent link</a></li><li id="t-info"><a href="/w/index.php?title=Models&amp;action=info" title="More information about this page">Page information</a></li>				</ul>
+					<li id="t-whatlinkshere"><a href="/wiki/Special:WhatLinksHere/Models" title="A list of all wiki pages that link here [j]" accesskey="j">What links here</a></li><li id="t-recentchangeslinked"><a href="/wiki/Special:RecentChangesLinked/Models" rel="nofollow" title="Recent changes in pages linked from this page [k]" accesskey="k">Related changes</a></li><li id="t-specialpages"><a href="/wiki/Special:SpecialPages" title="A list of all special pages [q]" accesskey="q">Special pages</a></li><li id="t-print"><a href="/w/index.php?title=Models&amp;printable=yes" rel="alternate" title="Printable version of this page [p]" accesskey="p">Printable version</a></li><li id="t-permalink"><a href="/w/index.php?title=Models&amp;oldid=121873" title="Permanent link to this revision of the page">Permanent link</a></li><li id="t-info"><a href="/w/index.php?title=Models&amp;action=info" title="More information about this page">Page information</a></li>				</ul>
 							</div>
 		</div>
 				</div>
 		</div>
 				<div id="footer" role="contentinfo">
 						<ul id="footer-info">
-								<li id="footer-info-lastmod"> This page was last edited on 16 March 2022, at 17:37.</li>
+								<li id="footer-info-lastmod"> This page was last edited on 22 March 2022, at 18:44.</li>
 							</ul>
 						<ul id="footer-places">
 								<li id="footer-places-privacy"><a href="/wiki/The_iPhone_Wiki:Privacy_policy" title="The iPhone Wiki:Privacy policy">Privacy policy</a></li>
@@ -11926,7 +11926,7 @@ <h3 id="p-tb-label">Tools</h3>
 									</ul>
 						<div style="clear: both;"></div>
 		</div>
-		<script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgPageParseReport":{"limitreport":{"cputime":"0.498","walltime":"0.500","ppvisitednodes":{"value":611,"limit":1000000},"ppgeneratednodes":{"value":1468,"limit":1000000},"postexpandincludesize":{"value":141,"limit":2097152},"templateargumentsize":{"value":23,"limit":2097152},"expansiondepth":{"value":3,"limit":40},"expensivefunctioncount":{"value":0,"limit":100},"unstrip-depth":{"value":0,"limit":20},"unstrip-size":{"value":6967,"limit":5000000},"timingprofile":["100.00%    1.969      1 -total"," 52.41%    1.032      1 Template:Main"," 40.48%    0.797      1 Template:Float_toc"]},"cachereport":{"timestamp":"20220316173659","ttl":86400,"transientcontent":false}}});});</script><script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgBackendResponseTime":33});});</script>
+		<script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgPageParseReport":{"limitreport":{"cputime":"0.526","walltime":"0.517","ppvisitednodes":{"value":611,"limit":1000000},"ppgeneratednodes":{"value":1468,"limit":1000000},"postexpandincludesize":{"value":141,"limit":2097152},"templateargumentsize":{"value":23,"limit":2097152},"expansiondepth":{"value":3,"limit":40},"expensivefunctioncount":{"value":0,"limit":100},"unstrip-depth":{"value":0,"limit":20},"unstrip-size":{"value":6967,"limit":5000000},"timingprofile":["100.00%    2.098      1 -total"," 52.81%    1.108      1 Template:Main"," 40.52%    0.850      1 Template:Float_toc"]},"cachereport":{"timestamp":"20220322184418","ttl":86400,"transientcontent":false}}});});</script><script>(window.RLQ=window.RLQ||[]).push(function(){mw.config.set({"wgBackendResponseTime":30});});</script>
 	</body>
-<!-- Cached 20220316174008 -->
+<!-- Cached 20220322184437 -->
 </html>
diff --git a/Sources/Devices/Devices.swift b/Sources/Devices/Devices.swift
index ef0bd3b..3ddde95 100644
--- a/Sources/Devices/Devices.swift
+++ b/Sources/Devices/Devices.swift
@@ -1,4 +1,4 @@
-// Generated on 2022-03-21 03:11:44 +0000
+// Generated on 2022-03-24 03:10:27 +0000
 // Manual modifications will be overwitten.
 
 public extension Airpod {
@@ -480,26 +480,26 @@ public extension iPadAir {
 			.init(generation: "iPad Air (4th generation)", aNumber: "A2324\nA2325\nA2072", bootrom: "Bootrom 5281.0.0.100.45", fccID: "BCGA2324\nBCGA2072", internalName: "J308AP", identifier: "iPad13,2", finish: "Green", storage: "256 GB", model: "MYH72, MYJ72"),
 			.init(generation: "iPad Air (4th generation)", aNumber: "A2324\nA2325\nA2072", bootrom: "Bootrom 5281.0.0.100.45", fccID: "BCGA2324\nBCGA2072", internalName: "J308AP", identifier: "iPad13,2", finish: "Sky Blue", storage: "64 GB", model: "MYH02, MYJ12"),
 			.init(generation: "iPad Air (4th generation)", aNumber: "A2324\nA2325\nA2072", bootrom: "Bootrom 5281.0.0.100.45", fccID: "BCGA2324\nBCGA2072", internalName: "J308AP", identifier: "iPad13,2", finish: "Sky Blue", storage: "256 GB", model: "MYH62, MYJ62"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Space Gray", storage: "64 GB", model: "MM9C3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Space Gray", storage: "256 GB", model: "MM9L3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Pink", storage: "64 GB", model: "MM9D3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Pink", storage: "256 GB", model: "MM9M3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Purple", storage: "64 GB", model: "MME23"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Purple", storage: "256 GB", model: "MME63"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Blue", storage: "64 GB", model: "MM9E3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Blue", storage: "256 GB", model: "MM9N3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Starlight", storage: "64 GB", model: "MM9F3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,6", finish: "Starlight", storage: "256 GB", model: "MM9P3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Space Gray", storage: "64 GB", model: "MM6R3, MM753"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Space Gray", storage: "256 GB", model: "MM713, MM7E3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Pink", storage: "64 GB", model: "MM6T3, MM9M3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Pink", storage: "256 GB", model: "MM723, MM7F3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Purple", storage: "64 GB", model: "MME93, MME23"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Purple", storage: "256 GB", model: "MMED3, MME63"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Blue", storage: "64 GB", model: "MM6U3, MM773"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Blue", storage: "256 GB", model: "MM733, MM7G3"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Starlight", storage: "64 GB", model: "MM6V3, MM783"),
-			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,7", finish: "Starlight", storage: "256 GB", model: "MM743, MM7H3")
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Space Gray", storage: "64 GB", model: "MM9C3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Space Gray", storage: "256 GB", model: "MM9L3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Pink", storage: "64 GB", model: "MM9D3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Pink", storage: "256 GB", model: "MM9M3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Purple", storage: "64 GB", model: "MME23"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Purple", storage: "256 GB", model: "MME63"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Blue", storage: "64 GB", model: "MM9E3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Blue", storage: "256 GB", model: "MM9N3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Starlight", storage: "64 GB", model: "MM9F3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J407AP", identifier: "iPad13,16", finish: "Starlight", storage: "256 GB", model: "MM9P3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Space Gray", storage: "64 GB", model: "MM6R3, MM753"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Space Gray", storage: "256 GB", model: "MM713, MM7E3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Pink", storage: "64 GB", model: "MM6T3, MM9M3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Pink", storage: "256 GB", model: "MM723, MM7F3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Purple", storage: "64 GB", model: "MME93, MME23"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Purple", storage: "256 GB", model: "MMED3, MME63"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Blue", storage: "64 GB", model: "MM6U3, MM773"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Blue", storage: "256 GB", model: "MM733, MM7G3"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Starlight", storage: "64 GB", model: "MM6V3, MM783"),
+			.init(generation: "iPad Air (5th generation)", aNumber: "?", bootrom: "?", fccID: "?", internalName: "J408AP", identifier: "iPad13,17", finish: "Starlight", storage: "256 GB", model: "MM743, MM7H3")
         ]
     }
 }