Added do_not_generate_pdf option