Added onEnable and onDisable