Added dry_run option