Added support for dry_run