Add new no_generate_plan option