Added onEnable & onDisable