Moved  events to execute after saving or deleting