Add support for --dry-run and --include-dirs