Added onEnabled and onDisabled in Component