Adding support for execution mode