diff --git a/src/main/htmlModules/ModuleGeneric.java b/src/main/htmlModules/ModuleGeneric.java
index f123ec7..9310415 100644
--- a/src/main/htmlModules/ModuleGeneric.java
+++ b/src/main/htmlModules/ModuleGeneric.java
@@ -33,6 +33,16 @@ public class ModuleGeneric {
     protected String globalAttributeTitle;
     protected Boolean globalAttributeTranslate;
     //Specific Attributes-----------------------------------------------------------------------------------------------
+    //<a>
+    protected String aAttributeDownload;
+    protected String aAttributeHref;
+    protected Enum aAttributeHreflang;
+    protected String aAttributeMedia;
+    protected String aAttributePing;
+    protected Enum aAttributeReferrerpolicy;
+    protected Enum aAttributeRel;
+    protected Enum aAttributeTarget;
+    protected Enum aAttributeType;
     //<area>
     protected String areaAttributeAlt;
     protected String areaAttributeCoords;
@@ -52,6 +62,11 @@ public class ModuleGeneric {
     protected boolean audioAttributeMuted;
     protected Enum audioAttributePreload;
     protected String audioAttributeSrc;
+    //<base>
+    protected String baseAttributeHref;
+    protected Enum baseAttributeTarget;
+    //<blockquote>
+    protected String blockquoteAttributeCite;
     //<button>
     protected boolean buttonAttributeAutofocus;
     protected boolean buttonAttributeDisabled;
@@ -66,6 +81,27 @@ public class ModuleGeneric {
     protected String buttonAttributeName;
     protected Enum buttonAttributeType;
     protected String buttonAttributeValue;
+    //<canvas>
+    protected int canvasAttributeHeight;
+    protected int canvasAttributeWidth;
+    //<col>
+    protected int colAttributeSpan;
+    //<colgroup>
+    protected int colgroupAttributeSpan;
+    //<del>
+    protected String delAttributeCite;
+    protected String delAttributeDatetime;
+    //<details>
+    protected boolean detailsAttributeOpen;
+    //<embed>
+    protected int embedAttributeHeight;
+    protected String embedAttributeSrc;
+    protected Enum embedAttributeType;
+    protected int embedAttributeWidth;
+    //<fieldset>
+    protected boolean fieldsetAttributeDisabled;
+    protected String fieldsetAttributeForm;
+    protected String fieldsetAttributeName;
     //<form>
     protected String formAttributeAcceptcharset;
     protected String formAttributeAction;
@@ -76,6 +112,18 @@ public class ModuleGeneric {
     protected boolean formAttributeNovalidate;
     protected Enum formAttributeRel;
     protected String formAttributeTarget; //and Enum
+    //<iframe>
+    protected String iframeAttributeAllow;
+    protected boolean iframeAttributeAllowfullscreen;
+    protected boolean iframeAttributeAllowpaymentrequest;
+    protected int iframeAttributeHeight;
+    protected Enum iframeAttributeLoading;
+    protected String iframeAttributeName;
+    protected Enum iframeAttributeReferrerpolicy;
+    protected Enum iframeAttributeSandbox;
+    protected String iframeAttributeSrc;
+    protected String iframeAttributeSrcdoc;
+    protected int iframeAttributeWidth;
     //<img>
     protected String imgAttributeAlt;
     protected Enum imgAttributeCrossorigin;
@@ -123,14 +171,72 @@ public class ModuleGeneric {
     protected Enum inputAttributeType;
     protected String inputAttributeValue;
     protected int inputAttributeWidth;
-    //<select>
-    protected boolean selectAttributeAutofocus;
-    protected boolean selectAttributeDisabled;
-    protected String selectAttributeForm;
-    protected boolean selectAttributeMultiple;
-    protected String selectAttributeName;
-    protected boolean selectAttributeRequired;
-    protected int selectAttributeSize;
+    //<ins>
+    protected String insAttributeCite;
+    protected String insAttributeDatetime;
+    //<label>
+    protected String labelAttributeFor;
+    protected String labelAttributeForm;
+    //<li>
+    protected int liAttributeValue;
+    //<link>
+    protected Enum linkAttributeCrossorigin;
+    protected String linkAttributeHref;
+    protected Enum linkAttributeHreflang;
+    protected String linkAttributeMedia;
+    protected Enum linkAttributeReferrerpolicy;
+    protected Enum linkAttributeRel;
+    protected String linkAttributeSizes;
+    protected String linkAttributeTitle;
+    protected Enum linkAttributeType;
+    //<map>
+    protected String mapAttributeName;
+    //<meta>
+    protected String metaAttributeCharset;
+    protected String metaAttributeContent;
+    protected Enum metaAttributeHttpequiv;
+    protected Enum metaAttributeName;
+    //<meter>
+    protected String meterAttributeFrom;
+    protected int meterAttributeHigh;
+    protected int meterAttributeLow;
+    protected int meterAttributeMax;
+    protected int meterAttributeMin;
+    protected int meterAttributeOptimum;
+    protected int meterAttributeValue;
+    //<object>
+    protected String objectAttributeData;
+    protected String objectAttributeForm;
+    protected int objectAttributeHeight;
+    protected String objectAttributeName;
+    protected Enum objectAttributeType;
+    protected boolean objectAttributeTypemustmatch;
+    protected String objectAttributeUsemap;
+    protected int objectAttributeWidth;
+    //<ol>
+    protected boolean olAttributeReversed;
+    protected int olAttributeStart;
+    protected Enum olAttributeType;
+    //<optgroup>
+    protected boolean optgroupAttributeDisabled;
+    protected String optgroupAttributeLabel;
+    //<option>
+    protected boolean optionAttributeDisabled;
+    protected String optionAttributeLabel;
+    protected boolean optionAttributeSelected;
+    protected String optionAttributeValue;
+    //<output>
+    protected String outputAttributeFor;
+    protected String outputAttributeForm;
+    protected String outputAttributeName;
+    //<param>
+    protected String paramAttributeName;
+    protected String paramAttributeValue;
+    //<progress>
+    protected int progressAttributeMax;
+    protected int progressAttributeValue;
+    //<q>
+    protected String qAttributeCite;
     //<script>
     protected boolean scriptAttributeAsync;
     protected Enum scriptAttributeCrossorigin;
@@ -140,6 +246,33 @@ public class ModuleGeneric {
     protected Enum scriptAttributeReferrerpolicy;
     protected String scriptAttributeSrc;
     protected Enum scriptAttributetype;
+    //<select>
+    protected boolean selectAttributeAutofocus;
+    protected boolean selectAttributeDisabled;
+    protected String selectAttributeForm;
+    protected boolean selectAttributeMultiple;
+    protected String selectAttributeName;
+    protected boolean selectAttributeRequired;
+    protected int selectAttributeSize;
+    //<source>
+    protected String sourceAttributeMedia;
+    protected String sourceAttributeSizes;
+    protected String sourceAttributeSrc;
+    protected String sourceAttributeSrcset;
+    protected Enum sourceAttributeType;
+    //<style>
+    protected String styleAttributeMedia;
+    protected Enum styleAttributeType;
+    //<td>
+    protected int tdAttributeColspan;
+    protected String tdAttributeHeaders;
+    protected int tdAttributeRowspan;
+    //<th>
+    protected String thAttributeAbbr;
+    protected int thAttributeColspan;
+    protected String thAttributeHeaders;
+    protected int thAttributeRowspan;
+    protected Enum thAttributeScope;
     //<textarea>
     protected boolean textareaAttributeAutofocus;
     protected int textareaAttributeCols;
@@ -153,6 +286,24 @@ public class ModuleGeneric {
     protected boolean textareaAttributeRequired;
     protected int textareaAttributeRows;
     protected Boolean textareaAttributeWrap;
+    //<time>
+    protected String timeAttributeDatetime;
+    //<track>
+    protected boolean trackAttributeDefault;
+    protected Enum trackAttributeKind;
+    protected String trackAttributeLabel;
+    protected String trackAttributeSrc;
+    protected Enum trackAttributeSrclang;
+    //<video>
+    protected boolean videoAttributeAutoplay;
+    protected boolean videoAttributeControls;
+    protected int videoAttributeHeight;
+    protected boolean videoAttributeLoop;
+    protected boolean videoAttributeMuted;
+    protected String videoAttributePoster;
+    protected Enum videoAttributePreload;
+    protected String videoAttributeSrc;
+    protected int videoAttributeWidth;