Add option to disable .exec