diff --git a/Xrm.Portal.js b/Xrm.Portal.js
index 7ac1fd1..9c542f4 100644
--- a/Xrm.Portal.js
+++ b/Xrm.Portal.js
@@ -94,7 +94,7 @@ Xrm.Portal = {
           var e = events[i];
           if (e.hasOwnProperty("t") && e.hasOwnProperty("f")) {
             console.log("Event wireup -> c: " + e.c + ", t: " + e.t + ", f: " + e.f);
-            var c = Xrm.Portal.Form.get(c); //CHECK
+            var c = Xrm.Portal.Utility.Selector.getByControlId(e.c); //CHECK
             switch (e.t) {
               case Xrm.Portal.EventType.OnChange:
                 this.attachOnChange(c, e.f);
@@ -112,6 +112,10 @@ Xrm.Portal = {
         console.log("attachOnChange -> control: " + control);
         control.change(callback);
         control.trigger("change");
+      },
+      removeOnChange: function(control) {
+        console.log("attachOnChange -> control: " + control);
+        control.off("change");
       }
     }
   },
@@ -289,6 +293,12 @@ Xrm.Portal = {
           Xrm.Portal.Utility.Validation.setValidation(g, this, customFunction, customMessage) :
           Xrm.Portal.Utility.Validation.removeValidation(g, this);
       };
+      this.attachOnChange = function(callback) {
+        Xrm.Portal.Utility.Event.attachOnChange(this.c, callback);
+      };
+      this.removeOnChange = function() {
+        Xrm.Portal.Utility.Event.removeOnChange(this.c);
+      };
     },
     Lookup: function(c) {
       this.s = Xrm.Portal.Utility.Selector;
@@ -331,6 +341,12 @@ Xrm.Portal = {
           Xrm.Portal.Utility.Validation.setValidation(g, this, customFunction, customMessage) :
           Xrm.Portal.Utility.Validation.removeValidation(g, this);
       };
+      this.attachOnChange = function(callback) {
+        Xrm.Portal.Utility.Event.attachOnChange(this.cL, callback);
+      };
+      this.removeOnChange = function() {
+        Xrm.Portal.Utility.Event.removeOnChange(this.cL);
+      };
     },
     Checkbox: function(c) {
       this.s = Xrm.Portal.Utility.Selector;
@@ -358,6 +374,12 @@ Xrm.Portal = {
           Xrm.Portal.Utility.Validation.setValidation(g, this, customFunction, customMessage) :
           Xrm.Portal.Utility.Validation.removeValidation(g, this);
       };
+      this.attachOnChange = function(callback) {
+        Xrm.Portal.Utility.Event.attachOnChange(this.c, callback);
+      };
+      this.removeOnChange = function() {
+        Xrm.Portal.Utility.Event.removeOnChange(this.c);
+      };
     },
     Radio: function(c) {
       this.s = Xrm.Portal.Utility.Selector;
@@ -385,6 +407,12 @@ Xrm.Portal = {
           Xrm.Portal.Utility.Validation.setValidation(g, this, customFunction, customMessage) :
           Xrm.Portal.Utility.Validation.removeValidation(g, this);
       };
+      this.attachOnChange = function(callback) {
+        Xrm.Portal.Utility.Event.attachOnChange(this.c, callback);
+      };
+      this.removeOnChange = function() {
+        Xrm.Portal.Utility.Event.removeOnChange(this.c);
+      };
     },
     DatetimePicker: function(c) {
       this.s = Xrm.Portal.Utility.Selector;
@@ -412,6 +440,12 @@ Xrm.Portal = {
           Xrm.Portal.Utility.Validation.setValidation(g, this, customFunction, customMessage) :
           Xrm.Portal.Utility.Validation.removeValidation(g, this);
       };
+      this.attachOnChange = function(callback) {
+        Xrm.Portal.Utility.Event.attachOnChange(this.c, callback);
+      };
+      this.removeOnChange = function() {
+        Xrm.Portal.Utility.Event.removeOnChange(this.c);
+      };
     },
   },
   EventType: {