diff --git a/Test/parse.test.js b/Test/parse.test.js
index 269c9c5..224ab0e 100644
--- a/Test/parse.test.js
+++ b/Test/parse.test.js
@@ -22,7 +22,7 @@ testParseClassFieldsWithEqualityCheck() {
         }
     }
 
-    const fields = window.Registry.parseClassFields(Space.toString());
+    const fields = window.Registry.parseClassFields(Space);
     if(!(JSON.stringify(fields) === JSON.stringify(["form", "contents"]))) {
         return `Fields don't match`
     }
@@ -52,7 +52,7 @@ testParseClassFieldsWithInnerFunctionVariable() {
         }
     }
 
-    const fields = window.Registry.parseClassFields(Space.toString());
+    const fields = window.Registry.parseClassFields(Space);
     if(!(JSON.stringify(fields) === JSON.stringify(["form", "contents"]))) {
         return `Fields don't match`
     }
diff --git a/index.js b/index.js
index bee744c..08e054f 100644
--- a/index.js
+++ b/index.js
@@ -18,8 +18,9 @@ window.$ = function(selector, el = document) {
 
 window.Registry = class Registry {
 
-    static parseClassFields(classStr) {
-        const lines = classStr.split('\n');
+    static parseClassFields(classObject) {
+        let str = classObject.toString();
+        const lines = str.split('\n');
         const fields = [];
         let braceDepth = 0; // Tracks the depth of curly braces to identify when we're inside a function/method
     
@@ -50,12 +51,7 @@ window.Registry = class Registry {
     }
 
     static registerElement = (el, tagname) => {
-        const randomClassName = 'Custom' + Math.random().toString(36).substring(2, 7);
-        const DynamicClass = {[randomClassName]: class extends el {}}[randomClassName];
-        const randomTagName = 'custom-' + Math.random().toString(36).substring(2, 7);
-        customElements.define(randomTagName, DynamicClass);
-        const instance = new DynamicClass();
-        let stateVariables = Object.keys(instance).filter(field => field.startsWith('$'));
+        let stateVariables = this.parseClassFields(el).filter(field => field.startsWith('$'));
         let stateVariablesWithout$ = stateVariables.map(str => str.substring(1));
         
         // Observe attributes
@@ -136,7 +132,7 @@ window.Registry = class Registry {
             }
 
             // Check if all state variables are set
-            for(state of stateVariables) {
+            for(let state of stateVariables) {
                 console.log(elem[state])
                 if(!elem[state]) {
                     console.error(`Quill: state ${state} must be initialized`)