Removing intermediate events
Adding self execution mode flag