Added onEnable and onDisable function