Added support for Haddop execution mode