diff --git a/src/main/htmlModules/ModuleGeneric.java b/src/main/htmlModules/ModuleGeneric.java
index 9310415..46fbd04 100644
--- a/src/main/htmlModules/ModuleGeneric.java
+++ b/src/main/htmlModules/ModuleGeneric.java
@@ -32,6 +32,85 @@ public class ModuleGeneric {
     protected int globalAttributeTabindex;
     protected String globalAttributeTitle;
     protected Boolean globalAttributeTranslate;
+    //Event Attributes--------------------------------------------------------------------------------------------------
+    //Window
+    protected String windowEventAttributeOnafterprint;
+    protected String windowEventAttributeOnbeforeprint;
+    protected String windowEventAttributeOnbeforeunload;
+    protected String windowEventAttributeOnerror;
+    protected String windowEventAttributeOnhashchange;
+    protected String windowEventAttributeOnload;
+    protected String windowEventAttributeOnmessage;
+    protected String windowEventAttributeOnoffline;
+    protected String windowEventAttributeOnonline;
+    protected String windowEventAttributeOnpagehide;
+    protected String windowEventAttributeOnpageshow;
+    protected String windowEventAttributeOnpopstate;
+    protected String windowEventAttributeOnresize;
+    protected String windowEventAttributeOnstorage;
+    protected String windowEventAttributeOnunload;
+    //Form
+    protected String formEventAttributeOnblur;
+    protected String formEventAttributeOnchange;
+    protected String formEventAttributeOncontextmenu;
+    protected String formEventAttributeOnfocus;
+    protected String formEventAttributeOninput;
+    protected String formEventAttributeOninvalid;
+    protected String formEventAttributeOnreset;
+    protected String formEventAttributeOnsearch;
+    protected String formEventAttributeOnselect;
+    protected String formEventAttributeOnsubmit;
+    //Keyboard
+    protected String keyboardEventAttributeOnkeydown;
+    protected String keyboardEventAttributeOnkeypress;
+    protected String keyboardEventAttributeOnkeyup;
+    //Mouse
+    protected String mouseEventAttributeOnclick;
+    protected String mouseEventAttributeOndblclick;
+    protected String mouseEventAttributeOnmousedown;
+    protected String mouseEventAttributeOnmousemove;
+    protected String mouseEventAttributeOnmouseout;
+    protected String mouseEventAttributeOnmouseover;
+    protected String mouseEventAttributeOnmouseup;
+    protected String mouseEventAttributeOnwheel;
+    //Drag
+    protected String dragEventAttributeOndrag;
+    protected String dragEventAttributeOndragend;
+    protected String dragEventAttributeOndragenter;
+    protected String dragEventAttributeOndragleave;
+    protected String dragEventAttributeOndragover;
+    protected String dragEventAttributeOndragstart;
+    protected String dragEventAttributeOndrop;
+    protected String dragEventAttributeOnscroll;
+    //Clipboard
+    protected String clipboardEventAttributeOncopy;
+    protected String clipboardEventAttributeOncut;
+    protected String clipboardEventAttributeOnpaste;
+    //Media
+    protected String mediaEventAttributeOnabort;
+    protected String mediaEventAttributeOncanplay;
+    protected String mediaEventAttributeOncanplaythrough;
+    protected String mediaEventAttributeOncuechange;
+    protected String mediaEventAttributeOndurationchange;
+    protected String mediaEventAttributeOnemptied;
+    protected String mediaEventAttributeOnended;
+    protected String mediaEventAttributeOnerror;
+    protected String mediaEventAttributeOnloadeddata;
+    protected String mediaEventAttributeOnloadedmetadata;
+    protected String mediaEventAttributeOnloadstart;
+    protected String mediaEventAttributeOnpause;
+    protected String mediaEventAttributeOnplaying;
+    protected String mediaEventAttributeOnprogress;
+    protected String mediaEventAttributeOnratechange;
+    protected String mediaEventAttributeOnseeked;
+    protected String mediaEventAttributeOnseeking;
+    protected String mediaEventAttributeOnstalled;
+    protected String mediaEventAttributeOnsuspend;
+    protected String mediaEventAttributeOntimeupdate;
+    protected String mediaEventAttributeOnvolumechange;
+    protected String mediaEventAttributeOnwaiting;
+    //Misc
+    protected String miscEventAttributeOntoggle;
     //Specific Attributes-----------------------------------------------------------------------------------------------
     //<a>
     protected String aAttributeDownload;