Add onEnable and onDisable