Added onDisabled method