Added OnSave & OnDelete to extensions. See issue #136