delete 32 bit releaser

add 32 bit releaser and add exit code in cmd
fix releaser
2020-06-05 14:37:37 +09:00 · 2020-06-05 14:30:08 +09:00 · 2020-05-29 18:38:22 +09:00 · 2020-05-29 18:31:25 +09:00 · 2020-05-29 18:24:15 +09:00 · 2020-05-29 18:13:07 +09:00
116 changed files with 7859 additions and 4166 deletions
--- a/.github/workflows/golangci.yml
+++ b/.github/workflows/golangci.yml
@@ -13,11 +13,10 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v1
        with:
          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.32
-          args: --timeout=10m
+          version: v1.26
          
          # Optional: working directory, useful for monorepos
          # working-directory: somedir
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -19,7 +19,7 @@ jobs:
        name: Set up Go
        uses: actions/setup-go@v2
        with:
-          go-version: 1.15
+          go-version: 1.14
      -
        name: Run GoReleaser
        uses: goreleaser/goreleaser-action@v2
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
    - name: Set up Go 1.x
      uses: actions/setup-go@v2
      with:
-        go-version: 1.15.x
+        go-version: 1.14.x
      id: go

    - name: Check out code into the Go module directory
--- a/.github/workflows/tidy.yml
+++ b/.github/workflows/tidy.yml
@@ -19,4 +19,4 @@ jobs:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          git_user_name: kotakanbe
          git_user_email: kotakanbe@gmail.com
-          go_version: 1.15.6
+          go_version: 1.14.x
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+vuls
 .vscode
 *.txt
 *.json
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -11,60 +11,27 @@ builds:
  - linux
  goarch:
  - amd64
-  main: ./cmd/vuls/main.go
+  main: .
  flags:
-  - -a
-  ldflags: 
-  - -s -w -X github.com/future-architect/vuls/config.Version={{.Version}} -X github.com/future-architect/vuls/config.Revision={{.Commit}}-{{ .CommitDate }}
+      - -a
+  ldflags: -s -w -X main.version={{.Version}} -X main.revision={{.Commit}} 
  binary: vuls

- id: vuls-scanner
-  env:
-  - CGO_ENABLED=0
-  goos:
-  - linux
-  goarch:
-  - 386
-  - amd64
-  - arm
-  - arm64
-  main: ./cmd/scanner/main.go
-  flags:
-  - -a
-  - -tags=scanner
-  ldflags: 
-  - -s -w -X github.com/future-architect/vuls/config.Version={{.Version}} -X github.com/future-architect/vuls/config.Revision={{.Commit}}-{{ .CommitDate }}
-  binary: vuls-scanner
-
 - id: trivy-to-vuls
-  env:
-  - CGO_ENABLED=0
  goos:
  - linux
  goarch:
-  - 386
  - amd64
-  - arm
-  - arm64
  main: ./contrib/trivy/cmd/main.go
  binary: trivy-to-vuls

 - id: future-vuls
-  env:
-  - CGO_ENABLED=0
  goos:
  - linux
  goarch:
-  - 386
  - amd64
-  - arm
-  - arm64
-  flags:
-  - -a
-  - -tags=scanner
  main: ./contrib/future-vuls/cmd/main.go
  binary: future-vuls
-
 archives:

 - id: vuls
@@ -78,17 +45,6 @@ archives:
  - README*
  - CHANGELOG.md

- id: vuls-scanner
-  name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
-  builds:
-  - vuls-scanner
-  format: tar.gz
-  files:
-  - LICENSE
-  - NOTICE
-  - README*
-  - CHANGELOG.md
-
 - id: trivy-to-vuls
  name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
  builds:
@@ -99,10 +55,10 @@ archives:
  - NOTICE
  - README*
  - CHANGELOG.md
-
 - id: future-vuls
  name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
  builds:
+
  - future-vuls
  format: tar.gz
  files:
--- a/2
+++ b/2
@@ -11,7 +11,7 @@ COPY . $GOPATH/src/$REPOSITORY
 RUN cd $GOPATH/src/$REPOSITORY && make install


-FROM alpine:3.11
+FROM alpine:3.7

 MAINTAINER hikachan sadayuki-matsuno

--- a/19
+++ b/19
@@ -20,26 +20,19 @@ BUILDTIME := $(shell date "+%Y%m%d_%H%M%S")
 LDFLAGS := -X 'github.com/future-architect/vuls/config.Version=$(VERSION)' \
    -X 'github.com/future-architect/vuls/config.Revision=build-$(BUILDTIME)_$(REVISION)'
 GO := GO111MODULE=on go
-CGO_UNABLED := CGO_ENABLED=0 go
 GO_OFF := GO111MODULE=off go


 all: build

-build: ./cmd/vuls/main.go pretest fmt
-	$(GO) build -a -ldflags "$(LDFLAGS)" -o vuls ./cmd/vuls
+build: main.go pretest fmt
+	$(GO) build -a -ldflags "$(LDFLAGS)" -o vuls $<

-b: ./cmd/vuls/main.go 
-	$(GO) build -a -ldflags "$(LDFLAGS)" -o vuls ./cmd/vuls
+b: 	main.go pretest fmt
+	$(GO) build -ldflags "$(LDFLAGS)" -o vuls $<

-install: ./cmd/vuls/main.go pretest fmt
-	$(GO) install -ldflags "$(LDFLAGS)" ./cmd/vuls
-
-build-scanner: ./cmd/scanner/main.go pretest fmt
-	$(CGO_UNABLED) build -tags=scanner -a -ldflags "$(LDFLAGS)" -o vuls ./cmd/scanner
-
-install-scanner: ./cmd/scanner/main.go pretest fmt
-	$(CGO_UNABLED) install -tags=scanner -ldflags "$(LDFLAGS)" ./cmd/scanner
+install: main.go pretest
+	$(GO) install -ldflags "$(LDFLAGS)"

 lint:
 	$(GO_OFF) get -u golang.org/x/lint/golint
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@

 ![Vuls-logo](img/vuls_logo.png)

-Vulnerability scanner for Linux/FreeBSD, agent-less, written in Go.
+Vulnerability scanner for Linux/FreeBSD, agentless, written in golang.
 We have a slack team. [Join slack team](http://goo.gl/forms/xm5KFo35tu)
 Twitter: [@vuls_en](https://twitter.com/vuls_en)

@@ -23,6 +23,20 @@ Twitter: [@vuls_en](https://twitter.com/vuls_en)

 ----

+## NEWS
+
+| Version     | Main Feature |  Date |
+|:------------|:---------------------------------|:--------------------|
+| [v0.8.0](https://github.com/future-architect/vuls/releases/tag/v0.8.0) | secret | Coming soon |
+| [v0.7.0](https://github.com/future-architect/vuls/releases/tag/v0.7.0) | WordPress Vulnerability Scan | 2019/Apr/8 |
+| [v0.6.3](https://github.com/future-architect/vuls/releases/tag/v0.6.3) | GitHub Integration | 2019/Feb/20 |
+| [v0.6.2](https://github.com/future-architect/vuls/releases/tag/v0.6.2) | Add US-CERT/JPCERT Alerts as VulnSrc | 2019/Jan/23 |
+| [v0.6.1](https://github.com/future-architect/vuls/releases/tag/v0.6.1) | BugFix | 2018/Nov/16 |
+| [v0.6.0](https://github.com/future-architect/vuls/releases/tag/v0.6.0) | Add ExploitDB as VulnSrc | 2018/Nov/3 |
+| [v0.5.0](https://github.com/future-architect/vuls/releases/tag/v0.5.0) | Scan accuracy improvement | 2018/Aug/27 |
+
+----
+
 ## Abstract

 For a system administrator, having to perform security vulnerability analysis and software update on a daily basis can be a burden.
@@ -52,47 +66,36 @@ Vuls is a tool created to solve the problems listed above. It has the following

 - Alpine, Amazon Linux, CentOS, Debian, Oracle Linux, Raspbian, RHEL, SUSE Enterprise Linux, and Ubuntu
 - FreeBSD
- Cloud, on-premise, Running Docker Container
+- Cloud, on-premise, Docker Container and Docker Image

 ### High-quality scan

- Vulnerability Database
-  - [NVD](https://nvd.nist.gov/)
-  - [JVN(Japanese)](http://jvndb.jvn.jp/apis/myjvn/)
+Vuls uses multiple vulnerability databases

+- [NVD](https://nvd.nist.gov/)
+- [JVN(Japanese)](http://jvndb.jvn.jp/apis/myjvn/)
 - OVAL
-  - [Red Hat](https://www.redhat.com/security/data/oval/)
  - [Debian](https://www.debian.org/security/oval/)
-  - [Ubuntu](https://people.canonical.com/~ubuntu-security/oval/)
-  - [SUSE](http://ftp.suse.com/pub/projects/security/oval/)
  - [Oracle Linux](https://linux.oracle.com/security/oval/)
+  - [RedHat](https://www.redhat.com/security/data/oval/)
+  - [SUSE](http://ftp.suse.com/pub/projects/security/oval/)
+  - [Ubuntu](https://people.canonical.com/~ubuntu-security/oval/)

- Security Advisory
-  - [Alpine-secdb](https://git.alpinelinux.org/cgit/alpine-secdb/)
-  - [Red Hat Security Advisories](https://access.redhat.com/security/security-updates/)
-  - [Debian Security Bug Tracker](https://security-tracker.debian.org/tracker/)
-
- Commands(yum, zypper, pkg-audit)
-  - RHSA / ALAS / ELSA / FreeBSD-SA
-  - Changelog
-
- PoC, Exploit
-  - [Exploit Database](https://www.exploit-db.com/)
-  - [Metasploit-Framework modules](https://www.rapid7.com/db/?q=&type=metasploit)
-
- CERT
-  - [US-CERT](https://www.us-cert.gov/ncas/alerts)
-  - [JPCERT](http://www.jpcert.or.jp/at/2019.html)
-
- Libraries
-  - [Node.js Security Working Group](https://github.com/nodejs/security-wg)
-  - [Ruby Advisory Database](https://github.com/rubysec/ruby-advisory-db)
-  - [Safety DB(Python)](https://github.com/pyupio/safety-db)
-  - [PHP Security Advisories Database](https://github.com/FriendsOfPHP/security-advisories)
-  - [RustSec Advisory Database](https://github.com/RustSec/advisory-db)
-
- WordPress
-  - [WPVulnDB](https://wpvulndb.com/api)
+- [Alpine-secdb](https://git.alpinelinux.org/cgit/alpine-secdb/)
+- [Debian Security Bug Tracker](https://security-tracker.debian.org/tracker/)
+- [Red Hat Security Advisories](https://access.redhat.com/security/security-updates/)
+- Commands (yum, zypper, and pkg-audit)
+  - RHSA/ALAS/ELSA/FreeBSD-SA
+- [Exploit Database](https://www.exploit-db.com/)
+- [US-CERT](https://www.us-cert.gov/ncas/alerts)
+- [JPCERT](http://www.jpcert.or.jp/at/2019.html)
+- [WPVulnDB](https://wpvulndb.com/api)
+- [Node.js Security Working Group](https://github.com/nodejs/security-wg)
+- [Ruby Advisory Database](https://github.com/rubysec/ruby-advisory-db)
+- [Safety DB(Python)](https://github.com/pyupio/safety-db)
+- [PHP Security Advisories Database](https://github.com/FriendsOfPHP/security-advisories)
+- [RustSec Advisory Database](https://github.com/RustSec/advisory-db)
+- Changelog

 ### Scan mode

@@ -131,6 +134,19 @@ Vuls is a tool created to solve the problems listed above. It has the following
 - It is possible to acquire the state of the server by connecting via SSH and executing the command.
 - Vuls warns when the scan target server was updated the kernel etc. but not restarting it.

+### **Static** Analysis
+
+**Image scan function is no longer supported from Vuls v0.9.5. Use Trivy directry**
+
+~~Vuls v0.8.0 can scan Docker images using [knqyf263/trivy](https://github.com/knqyf263/trivy).
+Following Registry supported.~~
+
+- ~~ECR~~
+- ~~GCR~~
+- ~~Local Image~~
+
+~~For details, see [Scan docker image](https://vuls.io/docs/en/tutorial-scan-docker-image.html)~~  
+
 ### Scan vulnerabilities of non-OS-packages

 - Libraries of programming language
@@ -168,7 +184,7 @@ Vuls has some options to detect the vulnerabilities

 ## Document

-For more information such as Installation, Tutorial, Usage, visit [vuls.io](https://vuls.io/)  
+For more information such as Installation, Tutorial, Usage, visit [vuls.io](https://vuls.io/)
 [日本語翻訳ドキュメント](https://vuls.io/ja/)

 ----
@@ -179,6 +195,12 @@ kotakanbe ([@kotakanbe](https://twitter.com/kotakanbe)) created vuls and [these

 ----

+## Change Log
+
+Please see [CHANGELOG](https://github.com/future-architect/vuls/blob/master/CHANGELOG.md).
+
+----
+
 ## Stargazers over time

 [![Stargazers over time](https://starcharts.herokuapp.com/future-architect/vuls.svg)](https://starcharts.herokuapp.com/future-architect/vuls)
--- a/cache/bolt.go
+++ b/cache/bolt.go
@@ -141,7 +141,7 @@ func (b Bolt) PrettyPrint(meta Meta) error {
 	})
 }

-// GetChangelog get the changelog of specified packName from the Bucket
+// GetChangelog get the changelgo of specified packName from the Bucket
 func (b Bolt) GetChangelog(servername, packName string) (changelog string, err error) {
 	err = b.db.View(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket([]byte(servername))
--- a/cmd/scanner/main.go
+++ b/cmd/scanner/main.go
@@ -1,36 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-
-	"context"
-
-	"github.com/future-architect/vuls/config"
-	commands "github.com/future-architect/vuls/subcmds"
-	"github.com/google/subcommands"
-)
-
-func main() {
-	subcommands.Register(subcommands.HelpCommand(), "")
-	subcommands.Register(subcommands.FlagsCommand(), "")
-	subcommands.Register(subcommands.CommandsCommand(), "")
-	subcommands.Register(&commands.DiscoverCmd{}, "discover")
-	subcommands.Register(&commands.ScanCmd{}, "scan")
-	subcommands.Register(&commands.HistoryCmd{}, "history")
-	subcommands.Register(&commands.ConfigtestCmd{}, "configtest")
-	subcommands.Register(&commands.SaaSCmd{}, "saas")
-
-	var v = flag.Bool("v", false, "Show version")
-
-	flag.Parse()
-
-	if *v {
-		fmt.Printf("vuls %s %s\n", config.Version, config.Revision)
-		os.Exit(int(subcommands.ExitSuccess))
-	}
-
-	ctx := context.Background()
-	os.Exit(int(subcommands.Execute(ctx)))
-}
--- a/commands/configtest.go
+++ b/commands/configtest.go
@@ -1,4 +1,4 @@
-package subcmds
+package commands

 import (
 	"context"
@@ -36,7 +36,7 @@ func (*ConfigtestCmd) Usage() string {
 			[-log-dir=/path/to/log]
 			[-ask-key-password]
 			[-timeout=300]
-			[-ssh-config]
+			[-ssh-external]
 			[-containers-only]
 			[-http-proxy=http://192.168.0.1:8080]
 			[-debug]
@@ -69,7 +69,7 @@ func (p *ConfigtestCmd) SetFlags(f *flag.FlagSet) {
 		"Use Native Go implementation of SSH. Default: Use the external command")

 	f.BoolVar(&c.Conf.SSHConfig, "ssh-config", false,
-		"[Deprecated] Use SSH options specified in ssh_config preferentially")
+		"Use SSH options specified in ssh_config preferentially")

 	f.BoolVar(&c.Conf.ContainersOnly, "containers-only", false,
 		"Test containers only. Default: Test both of hosts and containers")
@@ -79,6 +79,7 @@ func (p *ConfigtestCmd) SetFlags(f *flag.FlagSet) {

 // Execute execute
 func (p *ConfigtestCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+	// Setup Logger
 	util.Log = util.NewCustomLogger(c.ServerInfo{})

 	if err := mkdirDotVuls(); err != nil {
@@ -107,16 +108,6 @@ func (p *ConfigtestCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interfa
 		return subcommands.ExitUsageError
 	}

-	if c.Conf.SSHConfig {
-		msg := []string{
-			"-ssh-config is deprecated",
-			"If you update Vuls and get this error, there may be incompatible changes in config.toml",
-			"Please check config.toml template : https://vuls.io/docs/en/usage-settings.html",
-		}
-		util.Log.Errorf("%s", strings.Join(msg, "\n"))
-		return subcommands.ExitUsageError
-	}
-
 	var servernames []string
 	if 0 < len(f.Args()) {
 		servernames = f.Args()
--- a/commands/discover.go
+++ b/commands/discover.go
@@ -1,4 +1,4 @@
-package subcmds
+package commands

 import (
 	"context"
@@ -95,11 +95,6 @@ type        = "sqlite3"
 sqlite3Path = "/path/to/go-exploitdb.sqlite3"
 #url        = ""

-[metasploit]
-type        = "sqlite3"
-sqlite3Path = "/path/to/go-msfdb.sqlite3"
-#url        = ""
-
 # https://vuls.io/docs/en/usage-settings.html#slack-section
 #[slack]
 #hookURL      = "https://hooks.slack.com/services/abc123/defghijklmnopqrstuvwxyz"
@@ -149,6 +144,16 @@ sqlite3Path = "/path/to/go-msfdb.sqlite3"
 #accountKey    = "xxxxxxxxxxxxxx"
 #containerName = "vuls"

+# https://vuls.io/docs/en/usage-settings.html#stride-section
+#[stride]
+#hookURL   = "xxxxxxxxxxxxxxx"
+#authToken = "xxxxxxxxxxxxxx"
+
+# https://vuls.io/docs/en/usage-settings.html#hipchat-section
+#[hipchat]
+#room      = "vuls"
+#authToken = "xxxxxxxxxxxxxx"
+
 # https://vuls.io/docs/en/usage-settings.html#chatwork-section
 #[chatwork]
 #room     = "xxxxxxxxxxx"
@@ -182,7 +187,6 @@ sqlite3Path = "/path/to/go-msfdb.sqlite3"
 host                = "{{$ip}}"
 #port               = "22"
 #user               = "root"
-#sshConfigPath		= "/home/username/.ssh/config"
 #keyPath            = "/home/username/.ssh/id_rsa"
 #scanMode           = ["fast", "fast-root", "deep", "offline"]
 #type               = "pseudo"
--- a/commands/history.go
+++ b/commands/history.go
@@ -1,4 +1,4 @@
-package subcmds
+package commands

 import (
 	"context"
--- a/commands/report.go
+++ b/commands/report.go
@@ -1,6 +1,4 @@
-// +build !scanner
-
-package subcmds
+package commands

 import (
 	"context"
@@ -13,18 +11,22 @@ import (
 	"github.com/future-architect/vuls/exploit"
 	"github.com/future-architect/vuls/gost"
 	"github.com/future-architect/vuls/models"
-	"github.com/future-architect/vuls/msf"
 	"github.com/future-architect/vuls/oval"
 	"github.com/future-architect/vuls/report"
 	"github.com/future-architect/vuls/util"
 	"github.com/google/subcommands"
 	"github.com/k0kubun/pp"
+	cvelog "github.com/kotakanbe/go-cve-dictionary/log"
 )

 // ReportCmd is subcommand for reporting
 type ReportCmd struct {
-	configPath string
-	httpConf   c.HTTPConf
+	configPath  string
+	cveDict     c.GoCveDictConf
+	ovalDict    c.GovalDictConf
+	gostConf    c.GostConf
+	exploitConf c.ExploitConf
+	httpConf    c.HTTPConf
 }

 // Name return subcommand name
@@ -51,11 +53,14 @@ func (*ReportCmd) Usage() string {
 		[-to-email]
 		[-to-http]
 		[-to-slack]
+		[-to-stride]
+		[-to-hipchat]
 		[-to-chatwork]
 		[-to-telegram]
 		[-to-localfile]
 		[-to-s3]
 		[-to-azure-blob]
+		[-to-saas]
 		[-format-json]
 		[-format-xml]
 		[-format-one-email]
@@ -70,6 +75,18 @@ func (*ReportCmd) Usage() string {
 		[-quiet]
 		[-no-progress]
 		[-pipe]
+		[-cvedb-type=sqlite3|mysql|postgres|redis|http]
+		[-cvedb-sqlite3-path=/path/to/cve.sqlite3]
+		[-cvedb-url=http://127.0.0.1:1323 or DB connection string]
+		[-ovaldb-type=sqlite3|mysql|redis|http]
+		[-ovaldb-sqlite3-path=/path/to/oval.sqlite3]
+		[-ovaldb-url=http://127.0.0.1:1324 or DB connection string]
+		[-gostdb-type=sqlite3|mysql|redis|http]
+		[-gostdb-sqlite3-path=/path/to/gost.sqlite3]
+		[-gostdb-url=http://127.0.0.1:1325 or DB connection string]
+		[-exploitdb-type=sqlite3|mysql|redis|http]
+		[-exploitdb-sqlite3-path=/path/to/exploitdb.sqlite3]
+		[-exploitdb-url=http://127.0.0.1:1326 or DB connection string]
 		[-http="http://vuls-report-server"]
 		[-trivy-cachedb-dir=/path/to/dir]

@@ -122,7 +139,6 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {

 	f.BoolVar(&c.Conf.FormatJSON, "format-json", false, "JSON format")
 	f.BoolVar(&c.Conf.FormatXML, "format-xml", false, "XML format")
-	f.BoolVar(&c.Conf.FormatCsvList, "format-csv", false, "CSV format")
 	f.BoolVar(&c.Conf.FormatOneEMail, "format-one-email", false,
 		"Send all the host report via only one EMail (Specify with -to-email)")
 	f.BoolVar(&c.Conf.FormatOneLineText, "format-one-line-text", false,
@@ -132,6 +148,8 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
 		"Detail report in plain text")

 	f.BoolVar(&c.Conf.ToSlack, "to-slack", false, "Send report via Slack")
+	f.BoolVar(&c.Conf.ToStride, "to-stride", false, "Send report via Stride")
+	f.BoolVar(&c.Conf.ToHipChat, "to-hipchat", false, "Send report via hipchat")
 	f.BoolVar(&c.Conf.ToChatWork, "to-chatwork", false, "Send report via chatwork")
 	f.BoolVar(&c.Conf.ToTelegram, "to-telegram", false, "Send report via Telegram")
 	f.BoolVar(&c.Conf.ToEmail, "to-email", false, "Send report via Email")
@@ -142,10 +160,38 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
 	f.BoolVar(&c.Conf.ToHTTP, "to-http", false, "Send report via HTTP POST")
 	f.BoolVar(&c.Conf.ToAzureBlob, "to-azure-blob", false,
 		"Write report to Azure Storage blob (container/yyyyMMdd_HHmm/servername.json/xml/txt)")
+	f.BoolVar(&c.Conf.ToSaas, "to-saas", false,
+		"Upload report to Future Vuls(https://vuls.biz/) before report")

 	f.BoolVar(&c.Conf.GZIP, "gzip", false, "gzip compression")
+	f.BoolVar(&c.Conf.UUID, "uuid", false,
+		"Auto generate of scan target servers and then write to config.toml and scan result")
 	f.BoolVar(&c.Conf.Pipe, "pipe", false, "Use args passed via PIPE")

+	f.StringVar(&p.cveDict.Type, "cvedb-type", "",
+		"DB type of go-cve-dictionary (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.cveDict.SQLite3Path, "cvedb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.cveDict.URL, "cvedb-url", "",
+		"http://go-cve-dictionary.com:1323 or DB connection string")
+
+	f.StringVar(&p.ovalDict.Type, "ovaldb-type", "",
+		"DB type of goval-dictionary (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.ovalDict.SQLite3Path, "ovaldb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.ovalDict.URL, "ovaldb-url", "",
+		"http://goval-dictionary.com:1324 or DB connection string")
+
+	f.StringVar(&p.gostConf.Type, "gostdb-type", "",
+		"DB type of gost (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.gostConf.SQLite3Path, "gostdb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.gostConf.URL, "gostdb-url", "",
+		"http://gost.com:1325 or DB connection string")
+
+	f.StringVar(&p.exploitConf.Type, "exploitdb-type", "",
+		"DB type of exploit (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.exploitConf.SQLite3Path, "exploitdb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.exploitConf.URL, "exploitdb-url", "",
+		"http://exploit.com:1326 or DB connection string")
+
 	f.StringVar(&p.httpConf.URL, "http", "", "-to-http http://vuls-report")

 	f.StringVar(&c.Conf.TrivyCacheDBDir, "trivy-cachedb-dir",
@@ -155,11 +201,18 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
 // Execute execute
 func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
 	util.Log = util.NewCustomLogger(c.ServerInfo{})
+	cvelog.SetLogger(c.Conf.LogDir, false, c.Conf.Debug, false)
+
 	if err := c.Load(p.configPath, ""); err != nil {
 		util.Log.Errorf("Error loading %s, %+v", p.configPath, err)
 		return subcommands.ExitUsageError
 	}
-	c.Conf.HTTP.Init(p.httpConf)
+
+	c.Conf.CveDict.Overwrite(p.cveDict)
+	c.Conf.OvalDict.Overwrite(p.ovalDict)
+	c.Conf.Gost.Overwrite(p.gostConf)
+	c.Conf.Exploit.Overwrite(p.exploitConf)
+	c.Conf.HTTP.Overwrite(p.httpConf)

 	var dir string
 	var err error
@@ -173,117 +226,6 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 		return subcommands.ExitFailure
 	}

-	util.Log.Info("Validating config...")
-	if !c.Conf.ValidateOnReport() {
-		return subcommands.ExitUsageError
-	}
-
-	if !(c.Conf.FormatJSON || c.Conf.FormatOneLineText ||
-		c.Conf.FormatList || c.Conf.FormatFullText || c.Conf.FormatXML || c.Conf.FormatCsvList) {
-		c.Conf.FormatList = true
-	}
-
-	var loaded models.ScanResults
-	if loaded, err = report.LoadScanResults(dir); err != nil {
-		util.Log.Error(err)
-		return subcommands.ExitFailure
-	}
-	util.Log.Infof("Loaded: %s", dir)
-
-	var res models.ScanResults
-	hasError := false
-	for _, r := range loaded {
-		if len(r.Errors) == 0 {
-			res = append(res, r)
-		} else {
-			util.Log.Errorf("Ignored since errors occurred during scanning: %s, err: %v",
-				r.ServerName, r.Errors)
-			hasError = true
-		}
-	}
-
-	if len(res) == 0 {
-		return subcommands.ExitFailure
-	}
-
-	for _, r := range res {
-		util.Log.Debugf("%s: %s",
-			r.ServerInfo(),
-			pp.Sprintf("%s", c.Conf.Servers[r.ServerName]))
-	}
-
-	util.Log.Info("Validating db config...")
-	if !c.Conf.ValidateOnReportDB() {
-		return subcommands.ExitUsageError
-	}
-
-	if c.Conf.CveDict.URL != "" {
-		if err := report.CveClient.CheckHealth(); err != nil {
-			util.Log.Errorf("CVE HTTP server is not running. err: %+v", err)
-			util.Log.Errorf("Run go-cve-dictionary as server mode before reporting or run with `-cvedb-type=sqlite3 -cvedb-sqlite3-path` option instead of -cvedb-url")
-			return subcommands.ExitFailure
-		}
-	}
-
-	if c.Conf.OvalDict.URL != "" {
-		err := oval.Base{}.CheckHTTPHealth()
-		if err != nil {
-			util.Log.Errorf("OVAL HTTP server is not running. err: %+v", err)
-			util.Log.Errorf("Run goval-dictionary as server mode before reporting or run with `-ovaldb-type=sqlite3 -ovaldb-sqlite3-path` option instead of -ovaldb-url")
-			return subcommands.ExitFailure
-		}
-	}
-
-	if c.Conf.Gost.URL != "" {
-		util.Log.Infof("gost: %s", c.Conf.Gost.URL)
-		err := gost.Base{}.CheckHTTPHealth()
-		if err != nil {
-			util.Log.Errorf("gost HTTP server is not running. err: %+v", err)
-			util.Log.Errorf("Run gost as server mode before reporting or run with `-gostdb-type=sqlite3 -gostdb-sqlite3-path` option instead of -gostdb-url")
-			return subcommands.ExitFailure
-		}
-	}
-
-	if c.Conf.Exploit.URL != "" {
-		err := exploit.CheckHTTPHealth()
-		if err != nil {
-			util.Log.Errorf("exploit HTTP server is not running. err: %+v", err)
-			util.Log.Errorf("Run go-exploitdb as server mode before reporting")
-			return subcommands.ExitFailure
-		}
-	}
-
-	if c.Conf.Metasploit.URL != "" {
-		err := msf.CheckHTTPHealth()
-		if err != nil {
-			util.Log.Errorf("metasploit HTTP server is not running. err: %+v", err)
-			util.Log.Errorf("Run go-msfdb as server mode before reporting")
-			return subcommands.ExitFailure
-		}
-	}
-	dbclient, locked, err := report.NewDBClient(report.DBClientConf{
-		CveDictCnf:    c.Conf.CveDict,
-		OvalDictCnf:   c.Conf.OvalDict,
-		GostCnf:       c.Conf.Gost,
-		ExploitCnf:    c.Conf.Exploit,
-		MetasploitCnf: c.Conf.Metasploit,
-		DebugSQL:      c.Conf.DebugSQL,
-	})
-	if locked {
-		util.Log.Errorf("SQLite3 is locked. Close other DB connections and try again. err: %+v", err)
-		return subcommands.ExitFailure
-	}
-	if err != nil {
-		util.Log.Errorf("Failed to init DB Clients. err: %+v", err)
-		return subcommands.ExitFailure
-	}
-	defer dbclient.CloseDB()
-
-	if res, err = report.FillCveInfos(*dbclient, res, dir); err != nil {
-		util.Log.Errorf("%+v", err)
-		return subcommands.ExitFailure
-	}
-
 	// report
 	reports := []report.ResultWriter{
 		report.StdoutWriter{},
@@ -293,6 +235,14 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 		reports = append(reports, report.SlackWriter{})
 	}

+	if c.Conf.ToStride {
+		reports = append(reports, report.StrideWriter{})
+	}
+
+	if c.Conf.ToHipChat {
+		reports = append(reports, report.HipChatWriter{})
+	}
+
 	if c.Conf.ToChatWork {
 		reports = append(reports, report.ChatWorkWriter{})
 	}
@@ -349,6 +299,125 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 		reports = append(reports, report.AzureBlobWriter{})
 	}

+	if c.Conf.ToSaas {
+		if !c.Conf.UUID {
+			util.Log.Errorf("If you use the -to-saas option, you need to enable the uuid option")
+			return subcommands.ExitUsageError
+		}
+		reports = append(reports, report.SaasWriter{})
+	}
+
+	if !(c.Conf.FormatJSON || c.Conf.FormatOneLineText ||
+		c.Conf.FormatList || c.Conf.FormatFullText || c.Conf.FormatXML) {
+		c.Conf.FormatList = true
+	}
+
+	util.Log.Info("Validating config...")
+	if !c.Conf.ValidateOnReport() {
+		return subcommands.ExitUsageError
+	}
+
+	var loaded models.ScanResults
+	if loaded, err = report.LoadScanResults(dir); err != nil {
+		util.Log.Error(err)
+		return subcommands.ExitFailure
+	}
+	util.Log.Infof("Loaded: %s", dir)
+
+	var res models.ScanResults
+	hasError := false
+	for _, r := range loaded {
+		if len(r.Errors) == 0 {
+			res = append(res, r)
+		} else {
+			util.Log.Errorf("Ignored since errors occurred during scanning: %s, err: %v",
+				r.ServerName, r.Errors)
+			hasError = true
+		}
+	}
+
+	if len(res) == 0 {
+		return subcommands.ExitFailure
+	}
+
+	for _, r := range res {
+		util.Log.Debugf("%s: %s",
+			r.ServerInfo(),
+			pp.Sprintf("%s", c.Conf.Servers[r.ServerName]))
+	}
+
+	if c.Conf.UUID {
+		// Ensure UUIDs of scan target servers in config.toml
+		if err := report.EnsureUUIDs(p.configPath, res); err != nil {
+			util.Log.Errorf("Failed to ensure UUIDs. err: %+v", err)
+			return subcommands.ExitFailure
+		}
+	}
+
+	if !c.Conf.ToSaas {
+		util.Log.Info("Validating db config...")
+		if !c.Conf.ValidateOnReportDB() {
+			return subcommands.ExitUsageError
+		}
+
+		if c.Conf.CveDict.URL != "" {
+			if err := report.CveClient.CheckHealth(); err != nil {
+				util.Log.Errorf("CVE HTTP server is not running. err: %+v", err)
+				util.Log.Errorf("Run go-cve-dictionary as server mode before reporting or run with `-cvedb-type=sqlite3 -cvedb-sqlite3-path` option instead of -cvedb-url")
+				return subcommands.ExitFailure
+			}
+		}
+
+		if c.Conf.OvalDict.URL != "" {
+			err := oval.Base{}.CheckHTTPHealth()
+			if err != nil {
+				util.Log.Errorf("OVAL HTTP server is not running. err: %+v", err)
+				util.Log.Errorf("Run goval-dictionary as server mode before reporting or run with `-ovaldb-type=sqlite3 -ovaldb-sqlite3-path` option instead of -ovaldb-url")
+				return subcommands.ExitFailure
+			}
+		}
+
+		if c.Conf.Gost.URL != "" {
+			util.Log.Infof("gost: %s", c.Conf.Gost.URL)
+			err := gost.Base{}.CheckHTTPHealth()
+			if err != nil {
+				util.Log.Errorf("gost HTTP server is not running. err: %+v", err)
+				util.Log.Errorf("Run gost as server mode before reporting or run with `-gostdb-type=sqlite3 -gostdb-sqlite3-path` option instead of -gostdb-url")
+				return subcommands.ExitFailure
+			}
+		}
+
+		if c.Conf.Exploit.URL != "" {
+			err := exploit.CheckHTTPHealth()
+			if err != nil {
+				util.Log.Errorf("exploit HTTP server is not running. err: %+v", err)
+				util.Log.Errorf("Run go-exploitdb as server mode before reporting")
+				return subcommands.ExitFailure
+			}
+		}
+		dbclient, locked, err := report.NewDBClient(report.DBClientConf{
+			CveDictCnf:  c.Conf.CveDict,
+			OvalDictCnf: c.Conf.OvalDict,
+			GostCnf:     c.Conf.Gost,
+			ExploitCnf:  c.Conf.Exploit,
+			DebugSQL:    c.Conf.DebugSQL,
+		})
+		if locked {
+			util.Log.Errorf("SQLite3 is locked. Close other DB connections and try again. err: %+v", err)
+			return subcommands.ExitFailure
+		}
+		if err != nil {
+			util.Log.Errorf("Failed to init DB Clients. err: %+v", err)
+			return subcommands.ExitFailure
+		}
+		defer dbclient.CloseDB()
+
+		if res, err = report.FillCveInfos(*dbclient, res, dir); err != nil {
+			util.Log.Errorf("%+v", err)
+			return subcommands.ExitFailure
+		}
+	}
+
 	for _, w := range reports {
 		if err := w.Write(res...); err != nil {
 			util.Log.Errorf("Failed to report. err: %+v", err)
--- a/commands/scan.go
+++ b/commands/scan.go
@@ -1,4 +1,4 @@
-package subcmds
+package commands

 import (
 	"context"
@@ -49,7 +49,6 @@ func (*ScanCmd) Usage() string {
 		[-timeout=300]
 		[-timeout-scan=7200]
 		[-debug]
-		[-quiet]
 		[-pipe]
 		[-vvv]
 		[-ips]
@@ -62,7 +61,6 @@ func (*ScanCmd) Usage() string {
 // SetFlags set flag
 func (p *ScanCmd) SetFlags(f *flag.FlagSet) {
 	f.BoolVar(&c.Conf.Debug, "debug", false, "debug mode")
-	f.BoolVar(&c.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")

 	wd, _ := os.Getwd()
 	defaultConfPath := filepath.Join(wd, "config.toml")
@@ -82,7 +80,7 @@ func (p *ScanCmd) SetFlags(f *flag.FlagSet) {
 		"Use Native Go implementation of SSH. Default: Use the external command")

 	f.BoolVar(&c.Conf.SSHConfig, "ssh-config", false,
-		"[Deprecated] Use SSH options specified in ssh_config preferentially")
+		"Use SSH options specified in ssh_config preferentially")

 	f.BoolVar(&c.Conf.ContainersOnly, "containers-only", false,
 		"Scan running containers only. Default: Scan both of hosts and running containers")
@@ -148,16 +146,6 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		return subcommands.ExitUsageError
 	}

-	if c.Conf.SSHConfig {
-		msg := []string{
-			"-ssh-config is deprecated",
-			"If you update Vuls and get this error, there may be incompatible changes in config.toml",
-			"Please check config.toml template : https://vuls.io/docs/en/usage-settings.html",
-		}
-		util.Log.Errorf("%s", strings.Join(msg, "\n"))
-		return subcommands.ExitUsageError
-	}
-
 	util.Log.Info("Start scanning")
 	util.Log.Infof("config: %s", p.configPath)

--- a/commands/server.go
+++ b/commands/server.go
@@ -1,6 +1,4 @@
-// +build !scanner
-
-package subcmds
+package commands

 import (
 	"context"
@@ -15,18 +13,22 @@ import (
 	c "github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/exploit"
 	"github.com/future-architect/vuls/gost"
-	"github.com/future-architect/vuls/msf"
 	"github.com/future-architect/vuls/oval"
 	"github.com/future-architect/vuls/report"
 	"github.com/future-architect/vuls/server"
 	"github.com/future-architect/vuls/util"
 	"github.com/google/subcommands"
+	cvelog "github.com/kotakanbe/go-cve-dictionary/log"
 )

 // ServerCmd is subcommand for server
 type ServerCmd struct {
-	configPath string
-	listen     string
+	configPath  string
+	listen      string
+	cveDict     c.GoCveDictConf
+	ovalDict    c.GovalDictConf
+	gostConf    c.GostConf
+	exploitConf c.ExploitConf
 }

 // Name return subcommand name
@@ -51,6 +53,18 @@ func (*ServerCmd) Usage() string {
 		[-debug]
 		[-debug-sql]
 		[-listen=localhost:5515]
+		[-cvedb-type=sqlite3|mysql|postgres|redis|http]
+		[-cvedb-sqlite3-path=/path/to/cve.sqlite3]
+		[-cvedb-url=http://127.0.0.1:1323 or DB connection string]
+		[-ovaldb-type=sqlite3|mysql|redis|http]
+		[-ovaldb-sqlite3-path=/path/to/oval.sqlite3]
+		[-ovaldb-url=http://127.0.0.1:1324 or DB connection string]
+		[-gostdb-type=sqlite3|mysql|redis|http]
+		[-gostdb-sqlite3-path=/path/to/gost.sqlite3]
+		[-gostdb-url=http://127.0.0.1:1325 or DB connection string]
+		[-exploitdb-type=sqlite3|mysql|redis|http]
+		[-exploitdb-sqlite3-path=/path/to/exploitdb.sqlite3]
+		[-exploitdb-url=http://127.0.0.1:1326 or DB connection string]

 		[RFC3339 datetime format under results dir]
 `
@@ -63,8 +77,7 @@ func (p *ServerCmd) SetFlags(f *flag.FlagSet) {
 	f.BoolVar(&c.Conf.DebugSQL, "debug-sql", false, "SQL debug mode")

 	wd, _ := os.Getwd()
-	defaultConfPath := filepath.Join(wd, "config.toml")
-	f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml")
+	f.StringVar(&p.configPath, "config", "", "/path/to/toml")

 	defaultResultsDir := filepath.Join(wd, "results")
 	f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
@@ -79,7 +92,7 @@ func (p *ServerCmd) SetFlags(f *flag.FlagSet) {
 		"Don't Server the unscored CVEs")

 	f.BoolVar(&c.Conf.IgnoreUnfixed, "ignore-unfixed", false,
-		"Don't show the unfixed CVEs")
+		"Don't Server the unfixed CVEs")

 	f.StringVar(&c.Conf.HTTPProxy, "http-proxy", "",
 		"http://proxy-url:port (default: empty)")
@@ -89,16 +102,49 @@ func (p *ServerCmd) SetFlags(f *flag.FlagSet) {
 	f.BoolVar(&c.Conf.ToLocalFile, "to-localfile", false, "Write report to localfile")
 	f.StringVar(&p.listen, "listen", "localhost:5515",
 		"host:port (default: localhost:5515)")
+
+	f.StringVar(&p.cveDict.Type, "cvedb-type", "",
+		"DB type of go-cve-dictionary (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.cveDict.SQLite3Path, "cvedb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.cveDict.URL, "cvedb-url", "",
+		"http://go-cve-dictionary.com:1323 or DB connection string")
+
+	f.StringVar(&p.ovalDict.Type, "ovaldb-type", "",
+		"DB type of goval-dictionary (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.ovalDict.SQLite3Path, "ovaldb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.ovalDict.URL, "ovaldb-url", "",
+		"http://goval-dictionary.com:1324 or DB connection string")
+
+	f.StringVar(&p.gostConf.Type, "gostdb-type", "",
+		"DB type of gost (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.gostConf.SQLite3Path, "gostdb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.gostConf.URL, "gostdb-url", "",
+		"http://gost.com:1325 or DB connection string")
+
+	f.StringVar(&p.exploitConf.Type, "exploitdb-type", "",
+		"DB type of exploit (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.exploitConf.SQLite3Path, "exploitdb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.exploitConf.URL, "exploitdb-url", "",
+		"http://exploit.com:1326 or DB connection string")
 }

 // Execute execute
 func (p *ServerCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
 	util.Log = util.NewCustomLogger(c.ServerInfo{})
-	if err := c.Load(p.configPath, ""); err != nil {
-		util.Log.Errorf("Error loading %s. err: %+v", p.configPath, err)
-		return subcommands.ExitUsageError
+	cvelog.SetLogger(c.Conf.LogDir, false, c.Conf.Debug, false)
+
+	if p.configPath != "" {
+		if err := c.Load(p.configPath, ""); err != nil {
+			util.Log.Errorf("Error loading %s. err: %+v", p.configPath, err)
+			return subcommands.ExitUsageError
+		}
 	}

+	c.Conf.CveDict.Overwrite(p.cveDict)
+	c.Conf.OvalDict.Overwrite(p.ovalDict)
+	c.Conf.Gost.Overwrite(p.gostConf)
+	c.Conf.Exploit.Overwrite(p.exploitConf)
+
 	util.Log.Info("Validating config...")
 	if !c.Conf.ValidateOnReport() {
 		return subcommands.ExitUsageError
@@ -145,21 +191,12 @@ func (p *ServerCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 		}
 	}

-	if c.Conf.Metasploit.URL != "" {
-		err := msf.CheckHTTPHealth()
-		if err != nil {
-			util.Log.Errorf("metasploit HTTP server is not running. err: %+v", err)
-			util.Log.Errorf("Run go-msfdb as server mode before reporting")
-			return subcommands.ExitFailure
-		}
-	}
 	dbclient, locked, err := report.NewDBClient(report.DBClientConf{
-		CveDictCnf:    c.Conf.CveDict,
-		OvalDictCnf:   c.Conf.OvalDict,
-		GostCnf:       c.Conf.Gost,
-		ExploitCnf:    c.Conf.Exploit,
-		MetasploitCnf: c.Conf.Metasploit,
-		DebugSQL:      c.Conf.DebugSQL,
+		CveDictCnf:  c.Conf.CveDict,
+		OvalDictCnf: c.Conf.OvalDict,
+		GostCnf:     c.Conf.Gost,
+		ExploitCnf:  c.Conf.Exploit,
+		DebugSQL:    c.Conf.DebugSQL,
 	})
 	if locked {
 		util.Log.Errorf("SQLite3 is locked. Close other DB connections and try again: %+v", err)
--- a/commands/tui.go
+++ b/commands/tui.go
@@ -1,6 +1,4 @@
-// +build !scanner
-
-package subcmds
+package commands

 import (
 	"context"
@@ -13,16 +11,20 @@ import (
 	"github.com/future-architect/vuls/exploit"
 	"github.com/future-architect/vuls/gost"
 	"github.com/future-architect/vuls/models"
-	"github.com/future-architect/vuls/msf"
 	"github.com/future-architect/vuls/oval"
 	"github.com/future-architect/vuls/report"
 	"github.com/future-architect/vuls/util"
 	"github.com/google/subcommands"
+	cvelog "github.com/kotakanbe/go-cve-dictionary/log"
 )

 // TuiCmd is Subcommand of host discovery mode
 type TuiCmd struct {
-	configPath string
+	configPath  string
+	cveDict     c.GoCveDictConf
+	ovalDict    c.GovalDictConf
+	gostConf    c.GostConf
+	exploitConf c.ExploitConf
 }

 // Name return subcommand name
@@ -48,6 +50,18 @@ func (*TuiCmd) Usage() string {
 		[-quiet]
 		[-no-progress]
 		[-pipe]
+		[-cvedb-type=sqlite3|mysql|postgres|redis|http]
+		[-cvedb-sqlite3-path=/path/to/cve.sqlite3]
+		[-cvedb-url=http://127.0.0.1:1323 or DB connection string]
+		[-ovaldb-type=sqlite3|mysql|redis|http]
+		[-ovaldb-sqlite3-path=/path/to/oval.sqlite3]
+		[-ovaldb-url=http://127.0.0.1:1324 or DB connection string]
+		[-gostdb-type=sqlite3|mysql|redis|http]
+		[-gostdb-sqlite3-path=/path/to/gost.sqlite3]
+		[-gostdb-url=http://127.0.0.1:1325 or DB connection string]
+		[-exploitdb-type=sqlite3|mysql|redis|http]
+		[-exploitdb-sqlite3-path=/path/to/exploitdb.sqlite3]
+		[-exploitdb-url=http://127.0.0.1:1326 or DB connection string]
 		[-trivy-cachedb-dir=/path/to/dir]

 `
@@ -89,19 +103,51 @@ func (p *TuiCmd) SetFlags(f *flag.FlagSet) {

 	f.BoolVar(&c.Conf.Pipe, "pipe", false, "Use stdin via PIPE")

+	f.StringVar(&p.cveDict.Type, "cvedb-type", "",
+		"DB type of go-cve-dictionary (sqlite3, mysql, postgres or redis)")
+	f.StringVar(&p.cveDict.SQLite3Path, "cvedb-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.cveDict.URL, "cvedb-url", "",
+		"http://go-cve-dictionary.com:1323 or DB connection string")
+
+	f.StringVar(&p.ovalDict.Type, "ovaldb-type", "",
+		"DB type of goval-dictionary (sqlite3, mysql, postgres or redis)")
+	f.StringVar(&p.ovalDict.SQLite3Path, "ovaldb-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.ovalDict.URL, "ovaldb-url", "",
+		"http://goval-dictionary.com:1324 or DB connection string")
+
+	f.StringVar(&p.gostConf.Type, "gostdb-type", "",
+		"DB type of gost (sqlite3, mysql, postgres or redis)")
+	f.StringVar(&p.gostConf.SQLite3Path, "gostdb-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.gostConf.URL, "gostdb-url", "",
+		"http://gost.com:1325 or DB connection string")
+
+	f.StringVar(&p.exploitConf.Type, "exploitdb-type", "",
+		"DB type of exploit (sqlite3, mysql, postgres, redis or http)")
+	f.StringVar(&p.exploitConf.SQLite3Path, "exploitdb-sqlite3-path", "", "/path/to/sqlite3")
+	f.StringVar(&p.exploitConf.URL, "exploitdb-url", "",
+		"http://exploit.com:1326 or DB connection string")
+
 	f.StringVar(&c.Conf.TrivyCacheDBDir, "trivy-cachedb-dir",
 		utils.DefaultCacheDir(), "/path/to/dir")
 }

 // Execute execute
 func (p *TuiCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+	c.Conf.Lang = "en"
+
+	// Setup Logger
 	util.Log = util.NewCustomLogger(c.ServerInfo{})
+	cvelog.SetLogger(c.Conf.LogDir, false, c.Conf.Debug, false)
+
 	if err := c.Load(p.configPath, ""); err != nil {
 		util.Log.Errorf("Error loading %s, err: %+v", p.configPath, err)
 		return subcommands.ExitUsageError
 	}

-	c.Conf.Lang = "en"
+	c.Conf.CveDict.Overwrite(p.cveDict)
+	c.Conf.OvalDict.Overwrite(p.ovalDict)
+	c.Conf.Gost.Overwrite(p.gostConf)
+	c.Conf.Exploit.Overwrite(p.exploitConf)

 	var dir string
 	var err error
@@ -167,22 +213,12 @@ func (p *TuiCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
 			return subcommands.ExitFailure
 		}
 	}
-
-	if c.Conf.Metasploit.URL != "" {
-		err := msf.CheckHTTPHealth()
-		if err != nil {
-			util.Log.Errorf("metasploit HTTP server is not running. err: %+v", err)
-			util.Log.Errorf("Run go-msfdb as server mode before reporting")
-			return subcommands.ExitFailure
-		}
-	}
 	dbclient, locked, err := report.NewDBClient(report.DBClientConf{
-		CveDictCnf:    c.Conf.CveDict,
-		OvalDictCnf:   c.Conf.OvalDict,
-		GostCnf:       c.Conf.Gost,
-		ExploitCnf:    c.Conf.Exploit,
-		MetasploitCnf: c.Conf.Metasploit,
-		DebugSQL:      c.Conf.DebugSQL,
+		CveDictCnf:  c.Conf.CveDict,
+		OvalDictCnf: c.Conf.OvalDict,
+		GostCnf:     c.Conf.Gost,
+		ExploitCnf:  c.Conf.Exploit,
+		DebugSQL:    c.Conf.DebugSQL,
 	})
 	if locked {
 		util.Log.Errorf("SQLite3 is locked. Close other DB connections and try again: %+v", err)
--- a/commands/util.go
+++ b/commands/util.go
@@ -1,4 +1,4 @@
-package subcmds
+package commands

 import (
 	"fmt"
--- a/config/config.go
+++ b/config/config.go
@@ -16,7 +16,7 @@ import (
 )

 // Version of Vuls
-var Version = "`make build` or `make install` will show the version"
+var Version = "0.9.6"

 // Revision of Git
 var Revision string
@@ -75,7 +75,7 @@ const (
 )

 const (
-	// ServerTypePseudo is used for ServerInfo.Type, r.Family
+	// ServerTypePseudo is used for ServerInfo.Type
 	ServerTypePseudo = "pseudo"
 )

@@ -114,11 +114,10 @@ type Config struct {
 	UUID       bool `json:"uuid,omitempty"`
 	DetectIPS  bool `json:"detectIps,omitempty"`

-	CveDict    GoCveDictConf  `json:"cveDict,omitempty"`
-	OvalDict   GovalDictConf  `json:"ovalDict,omitempty"`
-	Gost       GostConf       `json:"gost,omitempty"`
-	Exploit    ExploitConf    `json:"exploit,omitempty"`
-	Metasploit MetasploitConf `json:"metasploit,omitempty"`
+	CveDict  GoCveDictConf `json:"cveDict,omitempty"`
+	OvalDict GovalDictConf `json:"ovalDict,omitempty"`
+	Gost     GostConf      `json:"gost,omitempty"`
+	Exploit  ExploitConf   `json:"exploit,omitempty"`

 	Slack    SlackConf    `json:"-"`
 	EMail    SMTPConf     `json:"-"`
@@ -126,12 +125,16 @@ type Config struct {
 	Syslog   SyslogConf   `json:"-"`
 	AWS      AWS          `json:"-"`
 	Azure    Azure        `json:"-"`
+	Stride   StrideConf   `json:"-"`
+	HipChat  HipChatConf  `json:"-"`
 	ChatWork ChatWorkConf `json:"-"`
 	Telegram TelegramConf `json:"-"`
 	Saas     SaasConf     `json:"-"`

 	RefreshCve        bool `json:"refreshCve,omitempty"`
 	ToSlack           bool `json:"toSlack,omitempty"`
+	ToStride          bool `json:"toStride,omitempty"`
+	ToHipChat         bool `json:"toHipChat,omitempty"`
 	ToChatWork        bool `json:"toChatWork,omitempty"`
 	ToTelegram        bool `json:"ToTelegram,omitempty"`
 	ToEmail           bool `json:"toEmail,omitempty"`
@@ -147,7 +150,6 @@ type Config struct {
 	FormatOneLineText bool `json:"formatOneLineText,omitempty"`
 	FormatList        bool `json:"formatList,omitempty"`
 	FormatFullText    bool `json:"formatFullText,omitempty"`
-	FormatCsvList     bool `json:"formatCsvList,omitempty"`
 	GZIP              bool `json:"gzip,omitempty"`
 	Diff              bool `json:"diff,omitempty"`
 	WpIgnoreInactive  bool `json:"wpIgnoreInactive,omitempty"`
@@ -243,10 +245,6 @@ func (c Config) ValidateOnReportDB() bool {
 		errs = append(errs, err)
 	}

-	if err := validateDB("msfdb", c.Metasploit.Type, c.Metasploit.SQLite3Path, c.Metasploit.URL); err != nil {
-		errs = append(errs, err)
-	}
-
 	for _, err := range errs {
 		log.Error(err)
 	}
@@ -278,10 +276,18 @@ func (c Config) ValidateOnReport() bool {
 		errs = append(errs, slackerrs...)
 	}

+	if hipchaterrs := c.HipChat.Validate(); 0 < len(hipchaterrs) {
+		errs = append(errs, hipchaterrs...)
+	}
+
 	if chatworkerrs := c.ChatWork.Validate(); 0 < len(chatworkerrs) {
 		errs = append(errs, chatworkerrs...)
 	}

+	if strideerrs := c.Stride.Validate(); 0 < len(strideerrs) {
+		errs = append(errs, strideerrs...)
+	}
+
 	if telegramerrs := c.Telegram.Validate(); 0 < len(telegramerrs) {
 		errs = append(errs, telegramerrs...)
 	}
@@ -429,6 +435,33 @@ func (c *SMTPConf) Validate() (errs []error) {
 	return
 }

+// StrideConf is stride config
+type StrideConf struct {
+	HookURL   string `json:"-"`
+	AuthToken string `json:"-"`
+}
+
+// Validate validates configuration
+func (c *StrideConf) Validate() (errs []error) {
+	if !Conf.ToStride {
+		return
+	}
+
+	if len(c.HookURL) == 0 {
+		errs = append(errs, xerrors.New("stride.HookURL must not be empty"))
+	}
+
+	if len(c.AuthToken) == 0 {
+		errs = append(errs, xerrors.New("stride.AuthToken must not be empty"))
+	}
+
+	_, err := valid.ValidateStruct(c)
+	if err != nil {
+		errs = append(errs, err)
+	}
+	return
+}
+
 // SlackConf is slack config
 type SlackConf struct {
 	HookURL     string   `valid:"url" json:"-" toml:"hookURL,omitempty"`
@@ -472,6 +505,32 @@ func (c *SlackConf) Validate() (errs []error) {
 	return
 }

+// HipChatConf is HipChat config
+type HipChatConf struct {
+	AuthToken string `json:"-"`
+	Room      string `json:"-"`
+}
+
+// Validate validates configuration
+func (c *HipChatConf) Validate() (errs []error) {
+	if !Conf.ToHipChat {
+		return
+	}
+	if len(c.Room) == 0 {
+		errs = append(errs, xerrors.New("hipcaht.room must not be empty"))
+	}
+
+	if len(c.AuthToken) == 0 {
+		errs = append(errs, xerrors.New("hipcaht.AuthToken must not be empty"))
+	}
+
+	_, err := valid.ValidateStruct(c)
+	if err != nil {
+		errs = append(errs, err)
+	}
+	return
+}
+
 // ChatWorkConf is ChatWork config
 type ChatWorkConf struct {
 	APIToken string `json:"-"`
@@ -484,11 +543,11 @@ func (c *ChatWorkConf) Validate() (errs []error) {
 		return
 	}
 	if len(c.Room) == 0 {
-		errs = append(errs, xerrors.New("chatWorkConf.room must not be empty"))
+		errs = append(errs, xerrors.New("chatworkcaht.room must not be empty"))
 	}

 	if len(c.APIToken) == 0 {
-		errs = append(errs, xerrors.New("chatWorkConf.ApiToken must not be empty"))
+		errs = append(errs, xerrors.New("chatworkcaht.ApiToken must not be empty"))
 	}

 	_, err := valid.ValidateStruct(c)
@@ -524,7 +583,7 @@ func (c *TelegramConf) Validate() (errs []error) {
 	return
 }

-// SaasConf is FutureVuls config
+// SaasConf is stride config
 type SaasConf struct {
 	GroupID int64  `json:"-"`
 	Token   string `json:"-"`
@@ -695,15 +754,16 @@ func (c *HTTPConf) Validate() (errs []error) {

 const httpKey = "VULS_HTTP_URL"

-// Init set options with the following priority.
-// 1. Environment variable
-// 2. config.toml
-func (c *HTTPConf) Init(toml HTTPConf) {
+// Overwrite set options with the following priority.
+// 1. Command line option
+// 2. Environment variable
+// 3. config.toml
+func (c *HTTPConf) Overwrite(cmdOpt HTTPConf) {
 	if os.Getenv(httpKey) != "" {
 		c.URL = os.Getenv(httpKey)
 	}
-	if toml.URL != "" {
-		c.URL = toml.URL
+	if cmdOpt.URL != "" {
+		c.URL = cmdOpt.URL
 	}
 }

@@ -733,10 +793,11 @@ const cveDBType = "CVEDB_TYPE"
 const cveDBURL = "CVEDB_URL"
 const cveDBPATH = "CVEDB_SQLITE3_PATH"

-// Init set options with the following priority.
-// 1. Environment variable
-// 2. config.toml
-func (cnf *GoCveDictConf) Init() {
+// Overwrite set options with the following priority.
+// 1. Command line option
+// 2. Environment variable
+// 3. config.toml
+func (cnf *GoCveDictConf) Overwrite(cmdOpt GoCveDictConf) {
 	if os.Getenv(cveDBType) != "" {
 		cnf.Type = os.Getenv(cveDBType)
 	}
@@ -746,6 +807,16 @@ func (cnf *GoCveDictConf) Init() {
 	if os.Getenv(cveDBPATH) != "" {
 		cnf.SQLite3Path = os.Getenv(cveDBPATH)
 	}
+
+	if cmdOpt.Type != "" {
+		cnf.Type = cmdOpt.Type
+	}
+	if cmdOpt.URL != "" {
+		cnf.URL = cmdOpt.URL
+	}
+	if cmdOpt.SQLite3Path != "" {
+		cnf.SQLite3Path = cmdOpt.SQLite3Path
+	}
 	cnf.setDefault()
 }

@@ -781,10 +852,11 @@ const govalType = "OVALDB_TYPE"
 const govalURL = "OVALDB_URL"
 const govalPATH = "OVALDB_SQLITE3_PATH"

-// Init set options with the following priority.
-// 1. Environment variable
-// 2. config.toml
-func (cnf *GovalDictConf) Init() {
+// Overwrite set options with the following priority.
+// 1. Command line option
+// 2. Environment variable
+// 3. config.toml
+func (cnf *GovalDictConf) Overwrite(cmdOpt GovalDictConf) {
 	if os.Getenv(govalType) != "" {
 		cnf.Type = os.Getenv(govalType)
 	}
@@ -794,6 +866,16 @@ func (cnf *GovalDictConf) Init() {
 	if os.Getenv(govalPATH) != "" {
 		cnf.SQLite3Path = os.Getenv(govalPATH)
 	}
+
+	if cmdOpt.Type != "" {
+		cnf.Type = cmdOpt.Type
+	}
+	if cmdOpt.URL != "" {
+		cnf.URL = cmdOpt.URL
+	}
+	if cmdOpt.SQLite3Path != "" {
+		cnf.SQLite3Path = cmdOpt.SQLite3Path
+	}
 	cnf.setDefault()
 }

@@ -828,10 +910,11 @@ const gostDBType = "GOSTDB_TYPE"
 const gostDBURL = "GOSTDB_URL"
 const gostDBPATH = "GOSTDB_SQLITE3_PATH"

-// Init set options with the following priority.
-// 1. Environment variable
-// 2. config.toml
-func (cnf *GostConf) Init() {
+// Overwrite set options with the following priority.
+// 1. Command line option
+// 2. Environment variable
+// 3. config.toml
+func (cnf *GostConf) Overwrite(cmdOpt GostConf) {
 	if os.Getenv(gostDBType) != "" {
 		cnf.Type = os.Getenv(gostDBType)
 	}
@@ -841,6 +924,16 @@ func (cnf *GostConf) Init() {
 	if os.Getenv(gostDBPATH) != "" {
 		cnf.SQLite3Path = os.Getenv(gostDBPATH)
 	}
+
+	if cmdOpt.Type != "" {
+		cnf.Type = cmdOpt.Type
+	}
+	if cmdOpt.URL != "" {
+		cnf.URL = cmdOpt.URL
+	}
+	if cmdOpt.SQLite3Path != "" {
+		cnf.SQLite3Path = cmdOpt.SQLite3Path
+	}
 	cnf.setDefault()
 }

@@ -875,10 +968,11 @@ const exploitDBType = "EXPLOITDB_TYPE"
 const exploitDBURL = "EXPLOITDB_URL"
 const exploitDBPATH = "EXPLOITDB_SQLITE3_PATH"

-// Init set options with the following priority.
-// 1. Environment variable
-// 2. config.toml
-func (cnf *ExploitConf) Init() {
+// Overwrite set options with the following priority.
+// 1. Command line option
+// 2. Environment variable
+// 3. config.toml
+func (cnf *ExploitConf) Overwrite(cmdOpt ExploitConf) {
 	if os.Getenv(exploitDBType) != "" {
 		cnf.Type = os.Getenv(exploitDBType)
 	}
@@ -888,6 +982,16 @@ func (cnf *ExploitConf) Init() {
 	if os.Getenv(exploitDBPATH) != "" {
 		cnf.SQLite3Path = os.Getenv(exploitDBPATH)
 	}
+
+	if cmdOpt.Type != "" {
+		cnf.Type = cmdOpt.Type
+	}
+	if cmdOpt.URL != "" {
+		cnf.URL = cmdOpt.URL
+	}
+	if cmdOpt.SQLite3Path != "" {
+		cnf.SQLite3Path = cmdOpt.SQLite3Path
+	}
 	cnf.setDefault()
 }

@@ -896,53 +1000,6 @@ func (cnf *ExploitConf) IsFetchViaHTTP() bool {
 	return Conf.Exploit.Type == "http"
 }

-// MetasploitConf is metasploit config
-type MetasploitConf struct {
-	// DB type for metasploit dictionary (sqlite3, mysql, postgres or redis)
-	Type string
-
-	// http://metasploit-dictionary.com:1324 or DB connection string
-	URL string `json:"-"`
-
-	// /path/to/metasploit.sqlite3
-	SQLite3Path string `json:"-"`
-}
-
-func (cnf *MetasploitConf) setDefault() {
-	if cnf.Type == "" {
-		cnf.Type = "sqlite3"
-	}
-	if cnf.URL == "" && cnf.SQLite3Path == "" {
-		wd, _ := os.Getwd()
-		cnf.SQLite3Path = filepath.Join(wd, "go-msfdb.sqlite3")
-	}
-}
-
-const metasploitDBType = "METASPLOITDB_TYPE"
-const metasploitDBURL = "METASPLOITDB_URL"
-const metasploitDBPATH = "METASPLOITDB_SQLITE3_PATH"
-
-// Init set options with the following priority.
-// 1. Environment variable
-// 2. config.toml
-func (cnf *MetasploitConf) Init() {
-	if os.Getenv(metasploitDBType) != "" {
-		cnf.Type = os.Getenv(metasploitDBType)
-	}
-	if os.Getenv(metasploitDBURL) != "" {
-		cnf.URL = os.Getenv(metasploitDBURL)
-	}
-	if os.Getenv(metasploitDBPATH) != "" {
-		cnf.SQLite3Path = os.Getenv(metasploitDBPATH)
-	}
-	cnf.setDefault()
-}
-
-// IsFetchViaHTTP returns wether fetch via http
-func (cnf *MetasploitConf) IsFetchViaHTTP() bool {
-	return Conf.Metasploit.Type == "http"
-}
-
 // AWS is aws config
 type AWS struct {
 	// AWS profile to use
@@ -975,42 +1032,42 @@ type Azure struct {

 // ServerInfo has SSH Info, additional CPE packages to scan.
 type ServerInfo struct {
-	ServerName         string                      `toml:"-" json:"serverName,omitempty"`
-	User               string                      `toml:"user,omitempty" json:"user,omitempty"`
-	Host               string                      `toml:"host,omitempty" json:"host,omitempty"`
-	JumpServer         []string                    `toml:"jumpServer,omitempty" json:"jumpServer,omitempty"`
-	Port               string                      `toml:"port,omitempty" json:"port,omitempty"`
-	SSHConfigPath      string                      `toml:"sshConfigPath,omitempty" json:"sshConfigPath,omitempty"`
-	KeyPath            string                      `toml:"keyPath,omitempty" json:"keyPath,omitempty"`
-	KeyPassword        string                      `json:"-,omitempty" toml:"-"`
-	CpeNames           []string                    `toml:"cpeNames,omitempty" json:"cpeNames,omitempty"`
-	ScanMode           []string                    `toml:"scanMode,omitempty" json:"scanMode,omitempty"`
-	OwaspDCXMLPath     string                      `toml:"owaspDCXMLPath,omitempty" json:"owaspDCXMLPath,omitempty"`
-	ContainersIncluded []string                    `toml:"containersIncluded,omitempty" json:"containersIncluded,omitempty"`
-	ContainersExcluded []string                    `toml:"containersExcluded,omitempty" json:"containersExcluded,omitempty"`
-	ContainerType      string                      `toml:"containerType,omitempty" json:"containerType,omitempty"`
-	Containers         map[string]ContainerSetting `toml:"containers" json:"containers,omitempty"`
-	IgnoreCves         []string                    `toml:"ignoreCves,omitempty" json:"ignoreCves,omitempty"`
-	IgnorePkgsRegexp   []string                    `toml:"ignorePkgsRegexp,omitempty" json:"ignorePkgsRegexp,omitempty"`
-	GitHubRepos        map[string]GitHubConf       `toml:"githubs" json:"githubs,omitempty"` // key: owner/repo
-	UUIDs              map[string]string           `toml:"uuids,omitempty" json:"uuids,omitempty"`
-	Memo               string                      `toml:"memo,omitempty" json:"memo,omitempty"`
-	Enablerepo         []string                    `toml:"enablerepo,omitempty" json:"enablerepo,omitempty"` // For CentOS, RHEL, Amazon
-	Optional           map[string]interface{}      `toml:"optional,omitempty" json:"optional,omitempty"`     // Optional key-value set that will be outputted to JSON
-	Lockfiles          []string                    `toml:"lockfiles,omitempty" json:"lockfiles,omitempty"`   // ie) path/to/package-lock.json
-	FindLock           bool                        `toml:"findLock,omitempty" json:"findLock,omitempty"`
-	Type               string                      `toml:"type,omitempty" json:"type,omitempty"` // "pseudo" or ""
-	WordPress          WordPressConf               `toml:"wordpress,omitempty" json:"wordpress,omitempty"`
-	IgnoredJSONKeys    []string                    `toml:"ignoredJSONKeys,omitempty" json:"ignoredJSONKeys,omitempty"`
+	ServerName             string                      `toml:"-" json:"serverName,omitempty"`
+	User                   string                      `toml:"user,omitempty" json:"user,omitempty"`
+	Host                   string                      `toml:"host,omitempty" json:"host,omitempty"`
+	Port                   string                      `toml:"port,omitempty" json:"port,omitempty"`
+	KeyPath                string                      `toml:"keyPath,omitempty" json:"keyPath,omitempty"`
+	KeyPassword            string                      `json:"-,omitempty" toml:"-"`
+	CpeNames               []string                    `toml:"cpeNames,omitempty" json:"cpeNames,omitempty"`
+	ScanMode               []string                    `toml:"scanMode,omitempty" json:"scanMode,omitempty"`
+	DependencyCheckXMLPath string                      `toml:"dependencyCheckXMLPath,omitempty" json:"-"` // TODO Deprecated remove in near future
+	OwaspDCXMLPath         string                      `toml:"owaspDCXMLPath,omitempty" json:"owaspDCXMLPath,omitempty"`
+	ContainersIncluded     []string                    `toml:"containersIncluded,omitempty" json:"containersIncluded,omitempty"`
+	ContainersExcluded     []string                    `toml:"containersExcluded,omitempty" json:"containersExcluded,omitempty"`
+	ContainerType          string                      `toml:"containerType,omitempty" json:"containerType,omitempty"`
+	Containers             map[string]ContainerSetting `toml:"containers" json:"containers,omitempty"`
+	IgnoreCves             []string                    `toml:"ignoreCves,omitempty" json:"ignoreCves,omitempty"`
+	IgnorePkgsRegexp       []string                    `toml:"ignorePkgsRegexp,omitempty" json:"ignorePkgsRegexp,omitempty"`
+	GitHubRepos            map[string]GitHubConf       `toml:"githubs" json:"githubs,omitempty"` // key: owner/repo
+	UUIDs                  map[string]string           `toml:"uuids,omitempty" json:"uuids,omitempty"`
+	Memo                   string                      `toml:"memo,omitempty" json:"memo,omitempty"`
+	Enablerepo             []string                    `toml:"enablerepo,omitempty" json:"enablerepo,omitempty"` // For CentOS, RHEL, Amazon
+	Optional               map[string]interface{}      `toml:"optional,omitempty" json:"optional,omitempty"`     // Optional key-value set that will be outputted to JSON
+	Lockfiles              []string                    `toml:"lockfiles,omitempty" json:"lockfiles,omitempty"`   // ie) path/to/package-lock.json
+	FindLock               bool                        `toml:"findLock,omitempty" json:"findLock,omitempty"`
+	Type                   string                      `toml:"type,omitempty" json:"type,omitempty"` // "pseudo" or ""

-	// internal use
-	IPv4Addrs       []string       `toml:"-" json:"ipv4Addrs,omitempty"`
-	IPv6Addrs       []string       `toml:"-" json:"ipv6Addrs,omitempty"`
-	IPSIdentifiers  map[IPS]string `toml:"-" json:"ipsIdentifiers,omitempty"`
-	LogMsgAnsiColor string         `toml:"-" json:"-"` // DebugLog Color
-	Container       Container      `toml:"-" json:"-"`
-	Distro          Distro         `toml:"-" json:"-"`
-	Mode            ScanMode       `toml:"-" json:"-"`
+	WordPress WordPressConf `toml:"wordpress,omitempty" json:"wordpress,omitempty"`
+
+	// used internal
+	IPv4Addrs      []string       `toml:"-" json:"ipv4Addrs,omitempty"`
+	IPv6Addrs      []string       `toml:"-" json:"ipv6Addrs,omitempty"`
+	IPSIdentifiers map[IPS]string `toml:"-" json:"ipsIdentifiers,omitempty"`
+
+	LogMsgAnsiColor string    `toml:"-" json:"-"` // DebugLog Color
+	Container       Container `toml:"-" json:"-"`
+	Distro          Distro    `toml:"-" json:"-"`
+	Mode            ScanMode  `toml:"-" json:"-"`
 }

 // ContainerSetting is used for loading container setting in config.toml
@@ -1109,7 +1166,7 @@ const (
 )

 // GetServerName returns ServerName if this serverInfo is about host.
-// If this serverInfo is about a container, returns containerID@ServerName
+// If this serverInfo is abount a container, returns containerID@ServerName
 func (s ServerInfo) GetServerName() string {
 	if len(s.Container.ContainerID) == 0 {
 		return s.ServerName
@@ -1128,18 +1185,21 @@ func (l Distro) String() string {
 }

 // MajorVersion returns Major version
-func (l Distro) MajorVersion() (int, error) {
+func (l Distro) MajorVersion() (ver int, err error) {
 	if l.Family == Amazon {
 		ss := strings.Fields(l.Release)
 		if len(ss) == 1 {
 			return 1, nil
 		}
-		return strconv.Atoi(ss[0])
+		ver, err = strconv.Atoi(ss[0])
+		return
 	}
 	if 0 < len(l.Release) {
-		return strconv.Atoi(strings.Split(l.Release, ".")[0])
+		ver, err = strconv.Atoi(strings.Split(l.Release, ".")[0])
+	} else {
+		err = xerrors.New("Release is empty")
 	}
-	return 0, xerrors.New("Release is empty")
+	return
 }

 // IsContainer returns whether this ServerInfo is about container
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -63,7 +63,7 @@ func TestSyslogConfValidate(t *testing.T) {
 	}
 }

-func TestDistro_MajorVersion(t *testing.T) {
+func TestMajorVersion(t *testing.T) {
 	var tests = []struct {
 		in  Distro
 		out int
--- a/config/tomlloader.go
+++ b/config/tomlloader.go
@@ -21,6 +21,8 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 	}
 	Conf.EMail = conf.EMail
 	Conf.Slack = conf.Slack
+	Conf.Stride = conf.Stride
+	Conf.HipChat = conf.HipChat
 	Conf.ChatWork = conf.ChatWork
 	Conf.Telegram = conf.Telegram
 	Conf.Saas = conf.Saas
@@ -33,7 +35,6 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 	Conf.OvalDict = conf.OvalDict
 	Conf.Gost = conf.Gost
 	Conf.Exploit = conf.Exploit
-	Conf.Metasploit = conf.Metasploit

 	d := conf.Default
 	Conf.Default = d
@@ -43,7 +44,7 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 		d.KeyPassword = keyPass
 	}

-	index := 0
+	i := 0
 	for serverName, v := range conf.Servers {
 		if 0 < len(v.KeyPassword) {
 			return xerrors.Errorf("[Deprecated] KEYPASSWORD IN CONFIG FILE ARE UNSECURE. REMOVE THEM IMMEDIATELY FOR A SECURITY REASONS. THEY WILL BE REMOVED IN A FUTURE RELEASE: %s", serverName)
@@ -56,11 +57,6 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 				return xerrors.Errorf("%s is invalid. host is empty", serverName)
 			}

-			s.JumpServer = v.JumpServer
-			if len(s.JumpServer) == 0 {
-				s.JumpServer = d.JumpServer
-			}
-
 			switch {
 			case v.Port != "":
 				s.Port = v.Port
@@ -81,11 +77,6 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 				}
 			}

-			s.SSHConfigPath = v.SSHConfigPath
-			if len(s.SSHConfigPath) == 0 {
-				s.SSHConfigPath = d.SSHConfigPath
-			}
-
 			s.KeyPath = v.KeyPath
 			if len(s.KeyPath) == 0 {
 				s.KeyPath = d.KeyPath
@@ -114,7 +105,7 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 			case "offline":
 				s.Mode.Set(Offline)
 			default:
-				return xerrors.Errorf("scanMode: %s of %s is invalid. Specify -fast, -fast-root, -deep or offline", m, serverName)
+				return xerrors.Errorf("scanMode: %s of %s is invalie. Specify -fast, -fast-root, -deep or offline", m, serverName)
 			}
 		}
 		if err := s.Mode.validate(); err != nil {
@@ -162,6 +153,10 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 			s.Containers[contName] = cont
 		}

+		if len(v.DependencyCheckXMLPath) != 0 || len(d.DependencyCheckXMLPath) != 0 {
+			return xerrors.Errorf("[DEPRECATED] dependencyCheckXMLPath IS DEPRECATED. USE owaspDCXMLPath INSTEAD: %s", serverName)
+		}
+
 		s.OwaspDCXMLPath = v.OwaspDCXMLPath
 		if len(s.OwaspDCXMLPath) == 0 {
 			s.OwaspDCXMLPath = d.OwaspDCXMLPath
@@ -202,14 +197,14 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 		for _, reg := range s.IgnorePkgsRegexp {
 			_, err := regexp.Compile(reg)
 			if err != nil {
-				return xerrors.Errorf("Failed to parse %s in %s. err: %w", reg, serverName, err)
+				return xerrors.Errorf("Faild to parse %s in %s. err: %w", reg, serverName, err)
 			}
 		}
 		for contName, cont := range s.Containers {
 			for _, reg := range cont.IgnorePkgsRegexp {
 				_, err := regexp.Compile(reg)
 				if err != nil {
-					return xerrors.Errorf("Failed to parse %s in %s@%s. err: %w",
+					return xerrors.Errorf("Faild to parse %s in %s@%s. err: %w",
 						reg, contName, serverName, err)
 				}
 			}
@@ -262,23 +257,12 @@ func (c TOMLLoader) Load(pathToToml, keyPass string) error {
 		s.WordPress.OSUser = v.WordPress.OSUser
 		s.WordPress.IgnoreInactive = v.WordPress.IgnoreInactive

-		s.IgnoredJSONKeys = v.IgnoredJSONKeys
-		if len(s.IgnoredJSONKeys) == 0 {
-			s.IgnoredJSONKeys = d.IgnoredJSONKeys
-		}
-
-		s.LogMsgAnsiColor = Colors[index%len(Colors)]
-		index++
+		s.LogMsgAnsiColor = Colors[i%len(Colors)]
+		i++

 		servers[serverName] = s
 	}
 	Conf.Servers = servers
-
-	Conf.CveDict.Init()
-	Conf.OvalDict.Init()
-	Conf.Gost.Init()
-	Conf.Exploit.Init()
-	Conf.Metasploit.Init()
 	return nil
 }

@@ -296,5 +280,5 @@ func toCpeURI(cpename string) (string, error) {
 		}
 		return naming.BindToURI(wfn), nil
 	}
-	return "", xerrors.Errorf("Unknown CPE format: %s", cpename)
+	return "", xerrors.Errorf("Unknow CPE format: %s", cpename)
 }
--- a/contrib/future-vuls/cmd/main.go
+++ b/contrib/future-vuls/cmd/main.go
@@ -10,7 +10,7 @@ import (

 	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/models"
-	"github.com/future-architect/vuls/saas"
+	"github.com/future-architect/vuls/report"
 	"github.com/spf13/cobra"
 )

@@ -73,7 +73,7 @@ func main() {
 			config.Conf.Saas.GroupID = groupID
 			config.Conf.Saas.Token = token
 			config.Conf.Saas.URL = url
-			if err = (saas.Writer{}).Write(scanResult); err != nil {
+			if err = (report.SaasWriter{}).Write(scanResult); err != nil {
 				fmt.Println(err)
 				os.Exit(1)
 				return
--- a/contrib/trivy/cmd/main.go
+++ b/contrib/trivy/cmd/main.go
@@ -72,7 +72,7 @@ func main() {
 	var rootCmd = &cobra.Command{Use: "trivy-to-vuls"}
 	rootCmd.AddCommand(cmdTrivyToVuls)
 	if err = rootCmd.Execute(); err != nil {
-		fmt.Println("Failed to execute command", err)
 		os.Exit(1)
+		fmt.Println("Failed to execute command", err)
 	}
 }
--- a/contrib/trivy/parser/parser.go
+++ b/contrib/trivy/parser/parser.go
@@ -45,6 +45,13 @@ func Parse(vulnJSON []byte, scanResult *models.ScanResult) (result *models.ScanR
 				notFixedYet = true
 				fixState = "Affected"
 			}
+			vulnInfo.AffectedPackages = append(vulnInfo.AffectedPackages, models.PackageFixStatus{
+				Name:        vuln.PkgName,
+				NotFixedYet: notFixedYet,
+				FixState:    fixState,
+				FixedIn:     vuln.FixedVersion,
+			})
+
 			var references models.References
 			for _, reference := range vuln.References {
 				references = append(references, models.Reference{
@@ -71,13 +78,6 @@ func Parse(vulnJSON []byte, scanResult *models.ScanResult) (result *models.ScanR
 					Name:    vuln.PkgName,
 					Version: vuln.InstalledVersion,
 				}
-				vulnInfo.AffectedPackages = append(vulnInfo.AffectedPackages, models.PackageFixStatus{
-					Name:        vuln.PkgName,
-					NotFixedYet: notFixedYet,
-					FixState:    fixState,
-					FixedIn:     vuln.FixedVersion,
-				})
-
 				// overwrite every time if os package
 				scanResult.Family = trivyResult.Type
 				scanResult.ServerName = trivyResult.Target
@@ -92,7 +92,6 @@ func Parse(vulnJSON []byte, scanResult *models.ScanResult) (result *models.ScanR
 				vulnInfo.LibraryFixedIns = append(vulnInfo.LibraryFixedIns, models.LibraryFixedIn{
 					Key:     trivyResult.Type,
 					Name:    vuln.PkgName,
-					Path:    trivyResult.Target,
 					FixedIn: vuln.FixedVersion,
 				})
 				libScanner := uniqueLibraryScannerPaths[trivyResult.Target]
--- a/contrib/trivy/parser/parser_test.go
+++ b/contrib/trivy/parser/parser_test.go
@@ -154,7 +154,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "guzzlehttp/guzzle",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "4.2.4, 5.3.1, 6.2.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Title:         "PHP: sets environmental variable based on user supplied Proxy request header",
@@ -195,7 +202,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "php-app/composer.lock",
 								Key:     "composer",
 								Name:    "guzzlehttp/guzzle",
 								FixedIn: "4.2.4, 5.3.1, 6.2.1",
@@ -211,7 +217,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "lodash",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">=4.17.5",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "LOW",
@@ -227,7 +240,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "node-app/package-lock.json",
 								Key:     "npm",
 								Name:    "lodash",
 								FixedIn: ">=4.17.5",
@@ -243,7 +255,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "rails-html-sanitizer",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">= 1.0.4",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -258,7 +277,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "rails-html-sanitizer",
 								FixedIn: ">= 1.0.4",
@@ -479,7 +497,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "lodash",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">=4.17.11",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "HIGH",
@@ -495,7 +520,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "node-app/package-lock.json",
 								Key:     "npm",
 								Name:    "lodash",
 								FixedIn: ">=4.17.11",
@@ -1813,7 +1837,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "jquery",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">=3.4.0",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -1826,7 +1857,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "node-app/package-lock.json",
 								Key:     "npm",
 								Name:    "jquery",
 								FixedIn: ">=3.4.0",
@@ -1842,7 +1872,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "nokogiri",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">= 1.10.4",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "HIGH",
@@ -1863,7 +1900,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "nokogiri",
 								FixedIn: ">= 1.10.4",
@@ -2091,7 +2127,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "urllib3",
+								NotFixedYet: true,
+								FixState:    "Affected",
+								FixedIn:     "",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -2117,7 +2160,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "python-app/Pipfile.lock",
 								Key:     "pipenv",
 								Name:    "urllib3",
 								FixedIn: "",
@@ -2133,7 +2175,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "urllib3",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "1.24.2",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -2157,7 +2206,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "python-app/Pipfile.lock",
 								Key:     "pipenv",
 								Name:    "urllib3",
 								FixedIn: "1.24.2",
@@ -2173,7 +2221,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "jquery",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">=3.4.0",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -2250,7 +2305,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "node-app/package-lock.json",
 								Key:     "npm",
 								Name:    "jquery",
 								FixedIn: ">=3.4.0",
@@ -2313,7 +2367,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "nokogiri",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">= 1.10.5",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -2338,7 +2399,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "nokogiri",
 								FixedIn: ">= 1.10.5",
@@ -2466,7 +2526,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "loofah",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">= 2.3.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -2485,7 +2552,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "loofah",
 								FixedIn: ">= 2.3.1",
@@ -2587,7 +2653,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "rack",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 1.6.12, >= 2.0.8",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "MEDIUM",
@@ -2608,7 +2681,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "rack",
 								FixedIn: "~> 1.6.12, >= 2.0.8",
@@ -2623,7 +2695,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "pyyaml",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "5.3.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "HIGH",
@@ -2640,7 +2719,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "python-app/Pipfile.lock",
 								Key:     "pipenv",
 								Name:    "pyyaml",
 								FixedIn: "5.3.1",
@@ -2655,7 +2733,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "actionview",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 5.2.4, >= 5.2.4.2, >= 6.0.2.2",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "LOW",
@@ -2675,7 +2760,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "actionview",
 								FixedIn: "~> 5.2.4, >= 5.2.4.2, >= 6.0.2.2",
@@ -2690,7 +2774,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "nokogiri",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">= 1.10.8",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "MEDIUM",
@@ -2708,7 +2799,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							models.LibraryFixedIn{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "nokogiri",
 								FixedIn: ">= 1.10.8",
@@ -2723,7 +2813,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "rake",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">= 12.3.3",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "CRITICAL",
@@ -2742,7 +2839,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							models.LibraryFixedIn{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "rake",
 								FixedIn: ">= 12.3.3",
@@ -2757,7 +2853,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "rack",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 2.1.3, >= 2.2.0",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "MEDIUM",
@@ -2771,7 +2874,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							models.LibraryFixedIn{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "rack",
 								FixedIn: "~> 2.1.3, >= 2.2.0",
@@ -2786,7 +2888,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "activestorage",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 5.2.4.3, >= 6.0.3.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "UNKNOWN",
@@ -2800,7 +2909,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							models.LibraryFixedIn{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "activestorage",
 								FixedIn: "~> 5.2.4.3, >= 6.0.3.1",
@@ -2815,7 +2923,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "json",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     ">= 2.3.0",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "MEDIUM",
@@ -2832,7 +2947,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							models.LibraryFixedIn{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "json",
 								FixedIn: ">= 2.3.0",
@@ -2847,7 +2961,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "actionpack",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 5.2.4.3, >= 6.0.3.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "UNKNOWN",
@@ -2858,7 +2979,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "actionpack",
 								FixedIn: "~> 5.2.4.3, >= 6.0.3.1",
@@ -2873,7 +2993,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "activesupport",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 5.2.4.3, >= 6.0.3.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "UNKNOWN",
@@ -2884,7 +3011,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "activesupport",
 								FixedIn: "~> 5.2.4.3, >= 6.0.3.1",
@@ -2899,7 +3025,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "actionpack",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 5.2.4.3, >= 6.0.3.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "UNKNOWN",
@@ -2910,7 +3043,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "actionpack",
 								FixedIn: "~> 5.2.4.3, >= 6.0.3.1",
@@ -2925,7 +3057,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "actionview",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "~> 5.2.4.3, >= 6.0.3.1",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "UNKNOWN",
@@ -2936,7 +3075,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "ruby-app/Gemfile.lock",
 								Key:     "bundler",
 								Name:    "actionview",
 								FixedIn: "~> 5.2.4.3, >= 6.0.3.1",
@@ -2951,7 +3089,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "lodash",
+								NotFixedYet: true,
+								FixState:    "Affected",
+								FixedIn:     "",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "HIGH",
@@ -2962,7 +3107,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "node-app/package-lock.json",
 								Key:     "npm",
 								Name:    "lodash",
 								FixedIn: "",
@@ -2977,7 +3121,14 @@ func TestParse(t *testing.T) {
 								DetectionMethod: "TrivyMatch",
 							},
 						},
-						AffectedPackages: models.PackageFixStatuses{},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "django-cors-headers",
+								NotFixedYet: false,
+								FixState:    "",
+								FixedIn:     "3.0.0",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": models.CveContent{
 								Cvss3Severity: "UNKNOWN",
@@ -2986,7 +3137,6 @@ func TestParse(t *testing.T) {
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
 							{
-								Path:    "python-app/Pipfile.lock",
 								Key:     "pipenv",
 								Name:    "django-cors-headers",
 								FixedIn: "3.0.0",
@@ -2994,9 +3144,16 @@ func TestParse(t *testing.T) {
 						},
 					},
 					"RUSTSEC-2016-0001": {
-						CveID:            "RUSTSEC-2016-0001",
-						Confidences:      models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
-						AffectedPackages: models.PackageFixStatuses{},
+						CveID:       "RUSTSEC-2016-0001",
+						Confidences: models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "openssl",
+								NotFixedYet: true,
+								FixState:    "Affected",
+								FixedIn:     "",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "UNKNOWN",
@@ -3006,18 +3163,20 @@ func TestParse(t *testing.T) {
 							},
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
-							{
-								Path:    "rust-app/Cargo.lock",
-								Key:     "cargo",
-								Name:    "openssl",
-								FixedIn: "",
-							},
+							{Key: "cargo", Name: "openssl", FixedIn: ""},
 						},
 					},
 					"RUSTSEC-2018-0003": {
-						CveID:            "RUSTSEC-2018-0003",
-						Confidences:      models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
-						AffectedPackages: models.PackageFixStatuses{},
+						CveID:       "RUSTSEC-2018-0003",
+						Confidences: models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "smallvec",
+								NotFixedYet: true,
+								FixState:    "Affected",
+								FixedIn:     "",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "UNKNOWN",
@@ -3027,18 +3186,20 @@ func TestParse(t *testing.T) {
 							},
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
-							{
-								Path:    "rust-app/Cargo.lock",
-								Key:     "cargo",
-								Name:    "smallvec",
-								FixedIn: "",
-							},
+							{Key: "cargo", Name: "smallvec", FixedIn: ""},
 						},
 					},
 					"RUSTSEC-2018-0010": {
-						CveID:            "RUSTSEC-2018-0010",
-						Confidences:      models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
-						AffectedPackages: models.PackageFixStatuses{},
+						CveID:       "RUSTSEC-2018-0010",
+						Confidences: models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
+						AffectedPackages: models.PackageFixStatuses{
+							models.PackageFixStatus{
+								Name:        "openssl",
+								NotFixedYet: true,
+								FixState:    "Affected",
+								FixedIn:     "",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "UNKNOWN",
@@ -3048,18 +3209,19 @@ func TestParse(t *testing.T) {
 							},
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
-							{
-								Path:    "rust-app/Cargo.lock",
-								Key:     "cargo",
-								Name:    "openssl",
-								FixedIn: "",
-							},
+							{Key: "cargo", Name: "openssl", FixedIn: ""},
 						},
 					},
 					"RUSTSEC-2018-0017": {
-						CveID:            "RUSTSEC-2018-0017",
-						Confidences:      models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
-						AffectedPackages: models.PackageFixStatuses{},
+						CveID:       "RUSTSEC-2018-0017",
+						Confidences: models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "tempdir",
+								NotFixedYet: true,
+								FixState:    "Affected",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "UNKNOWN",
@@ -3069,18 +3231,20 @@ func TestParse(t *testing.T) {
 							},
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
-							{
-								Path:    "rust-app/Cargo.lock",
-								Key:     "cargo",
-								Name:    "tempdir",
-								FixedIn: "",
-							},
+							{Key: "cargo", Name: "tempdir", FixedIn: ""},
 						},
 					},
 					"RUSTSEC-2019-0001": {
-						CveID:            "RUSTSEC-2019-0001",
-						Confidences:      models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
-						AffectedPackages: models.PackageFixStatuses{},
+						CveID:       "RUSTSEC-2019-0001",
+						Confidences: models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "ammonia",
+								NotFixedYet: true,
+								FixState:    "Affected",
+								FixedIn:     "",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "UNKNOWN",
@@ -3090,17 +3254,18 @@ func TestParse(t *testing.T) {
 							},
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
-							{
-								Path:    "rust-app/Cargo.lock",
-								Key:     "cargo",
-								Name:    "ammonia",
-								FixedIn: "",
-							},
+							{Key: "cargo", Name: "ammonia", FixedIn: ""},
 						},
 					},
 					"RUSTSEC-2019-0009": {CveID: "RUSTSEC-2019-0009",
-						Confidences:      models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
-						AffectedPackages: models.PackageFixStatuses{},
+						Confidences: models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "smallvec",
+								NotFixedYet: true,
+								FixState:    "Affected",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "UNKNOWN",
@@ -3110,18 +3275,20 @@ func TestParse(t *testing.T) {
 							},
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
-							{
-								Path:    "rust-app/Cargo.lock",
-								Key:     "cargo",
-								Name:    "smallvec",
-								FixedIn: "",
-							},
+							{Key: "cargo", Name: "smallvec", FixedIn: ""},
 						},
 					},
 					"RUSTSEC-2019-0012": {
-						CveID:            "RUSTSEC-2019-0012",
-						Confidences:      models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
-						AffectedPackages: models.PackageFixStatuses{},
+						CveID:       "RUSTSEC-2019-0012",
+						Confidences: models.Confidences{{Score: 100, DetectionMethod: "TrivyMatch"}},
+						AffectedPackages: models.PackageFixStatuses{
+							{
+								Name:        "smallvec",
+								NotFixedYet: true,
+								FixState:    "Affected",
+								FixedIn:     "",
+							},
+						},
 						CveContents: models.CveContents{
 							"trivy": {
 								Cvss3Severity: "UNKNOWN",
@@ -3131,12 +3298,7 @@ func TestParse(t *testing.T) {
 							},
 						},
 						LibraryFixedIns: models.LibraryFixedIns{
-							{
-								Path:    "rust-app/Cargo.lock",
-								Key:     "cargo",
-								Name:    "smallvec",
-								FixedIn: "",
-							},
+							{Key: "cargo", Name: "smallvec", FixedIn: ""},
 						},
 					},
 				},
--- a/exploit/exploit.go
+++ b/exploit/exploit.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package exploit

 import (
--- a/github/github.go
+++ b/github/github.go
@@ -15,7 +15,7 @@ import (
 	"golang.org/x/oauth2"
 )

-// FillGitHubSecurityAlerts access to owner/repo on GitHub and fetch security alerts of the repository via GitHub API v4 GraphQL and then set to the given ScanResult.
+// FillGitHubSecurityAlerts access to owner/repo on GitHub and fetch scurity alerts of the repository via GitHub API v4 GraphQL and then set to the given ScanResult.
 // https://help.github.com/articles/about-security-alerts-for-vulnerable-dependencies/
 func FillGitHubSecurityAlerts(r *models.ScanResult, owner, repo, token string) (nCVEs int, err error) {
 	src := oauth2.StaticTokenSource(
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/future-architect/vuls

-go 1.15
+go 1.13

 replace (
 	gopkg.in/mattn/go-colorable.v0 => github.com/mattn/go-colorable v0.1.0
@@ -8,73 +8,50 @@ replace (
 )

 require (
-	github.com/Azure/azure-sdk-for-go v49.1.0+incompatible
-	github.com/Azure/go-autorest/autorest v0.11.15 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.10 // indirect
+	github.com/Azure/azure-sdk-for-go v42.0.0+incompatible
 	github.com/BurntSushi/toml v0.3.1
 	github.com/RackSec/srslog v0.0.0-20180709174129-a4725f04ec91
-	github.com/aquasecurity/fanal v0.0.0-20201218050947-981a0510f9cb
-	github.com/aquasecurity/trivy v0.14.0
-	github.com/aquasecurity/trivy-db v0.0.0-20201220084758-2d91316c83fa
-	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
-	github.com/aws/aws-sdk-go v1.36.12
+	github.com/aquasecurity/fanal v0.0.0-20200505074551-9239a362deca
+	github.com/aquasecurity/go-dep-parser v0.0.0-20200123140603-4dc0125084da // indirect
+	github.com/aquasecurity/trivy v0.8.0
+	github.com/aquasecurity/trivy-db v0.0.0-20200514134639-7e57e3e02470
+	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
+	github.com/aws/aws-sdk-go v1.30.16
 	github.com/boltdb/bolt v1.3.1
-	github.com/briandowns/spinner v1.12.0 // indirect
-	github.com/caarlos0/env/v6 v6.4.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/d4l3k/messagediff v1.2.2-0.20190829033028-7e0a312ae40b
-	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
-	github.com/emersion/go-smtp v0.14.0
-	github.com/goccy/go-yaml v1.8.4 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/google/subcommands v1.2.0
-	github.com/google/wire v0.4.0 // indirect
 	github.com/gosuri/uitable v0.0.4
-	github.com/grokify/html-strip-tags-go v0.0.0-20200923094847-079d207a09f1 // indirect
 	github.com/hashicorp/go-uuid v1.0.2
-	github.com/hashicorp/go-version v1.2.1
+	github.com/hashicorp/go-version v1.2.0
 	github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c
 	github.com/jesseduffield/gocui v0.3.0
 	github.com/k0kubun/pp v3.0.1+incompatible
-	github.com/knqyf263/go-apk-version v0.0.0-20200609155635-041fdbb8563f
-	github.com/knqyf263/go-cpe v0.0.0-20201213041631-54f6ab28673f
+	github.com/knqyf263/go-apk-version v0.0.0-20200507080916-9f84b1e3c54c
+	github.com/knqyf263/go-cpe v0.0.0-20180327054844-659663f6eca2
 	github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d
 	github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936
-	github.com/knqyf263/gost v0.1.7
-	github.com/kotakanbe/go-cve-dictionary v0.5.6
+	github.com/knqyf263/go-version v1.1.1
+	github.com/knqyf263/gost v0.1.3
+	github.com/kotakanbe/go-cve-dictionary v0.4.2
 	github.com/kotakanbe/go-pingscanner v0.1.0
-	github.com/kotakanbe/goval-dictionary v0.2.16
+	github.com/kotakanbe/goval-dictionary v0.2.5
 	github.com/kotakanbe/logrus-prefixed-formatter v0.0.0-20180123152602-928f7356cb96
-	github.com/magiconair/properties v1.8.4 // indirect
-	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/mitchellh/mapstructure v1.4.0 // indirect
-	github.com/mozqnet/go-exploitdb v0.1.2
+	github.com/mozqnet/go-exploitdb v0.0.0-20190911093644-f647f17ea8ca
 	github.com/nlopes/slack v0.6.0
-	github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 // indirect
+	github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/parnurzeal/gorequest v0.2.16
-	github.com/pelletier/go-toml v1.8.1 // indirect
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
-	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/afero v1.5.1
-	github.com/spf13/cast v1.3.1 // indirect
-	github.com/spf13/cobra v1.1.1
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.7.1 // indirect
-	github.com/takuzoo3868/go-msfdb v0.1.3
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.16.0 // indirect
-	golang.org/x/crypto v0.0.0-20201217014255-9d1352758620
-	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
-	golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
-	golang.org/x/sys v0.0.0-20201218084310-7d0127a74742 // indirect
-	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
-	golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
-	google.golang.org/appengine v1.6.7 // indirect
-	gopkg.in/ini.v1 v1.62.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	honnef.co/go/tools v0.1.0 // indirect
-	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
+	github.com/sirupsen/logrus v1.5.0
+	github.com/spf13/afero v1.2.2
+	github.com/spf13/cobra v0.0.5
+	golang.org/x/crypto v0.0.0-20200414173820-0848c9571904
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d // indirect
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
+	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
 )
--- a/go.sum
+++ b/go.sum
--- a/gost/base.go
+++ b/gost/base.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package gost

 import (
--- a/gost/debian.go
+++ b/gost/debian.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package gost

 import (
@@ -23,23 +21,8 @@ type packCves struct {
 	cves      []models.CveContent
 }

-func (deb Debian) supported(major string) bool {
-	_, ok := map[string]string{
-		"8":  "jessie",
-		"9":  "stretch",
-		"10": "buster",
-	}[major]
-	return ok
-}
-
 // DetectUnfixed fills cve information that has in Gost
 func (deb Debian) DetectUnfixed(driver db.DB, r *models.ScanResult, _ bool) (nCVEs int, err error) {
-	if !deb.supported(major(r.Release)) {
-		// only logging
-		util.Log.Warnf("Debian %s is not supported yet", r.Release)
-		return 0, nil
-	}
-
 	linuxImage := "linux-image-" + r.RunningKernel.Release
 	// Add linux and set the version of running kernel to search OVAL.
 	if r.Container.ContainerID == "" {
@@ -54,17 +37,9 @@ func (deb Debian) DetectUnfixed(driver db.DB, r *models.ScanResult, _ bool) (nCV
 		}
 	}

-	// Debian Security Tracker does not support Package for Raspbian, so skip it.
-	var scanResult models.ScanResult
-	if r.Family != config.Raspbian {
-		scanResult = *r
-	} else {
-		scanResult = r.RemoveRaspbianPackFromResult()
-	}
-
 	packCvesList := []packCves{}
 	if config.Conf.Gost.IsFetchViaHTTP() {
-		url, _ := util.URLPathJoin(config.Conf.Gost.URL, "debian", major(scanResult.Release), "pkgs")
+		url, _ := util.URLPathJoin(config.Conf.Gost.URL, "debian", major(r.Release), "pkgs")
 		responses, err := getAllUnfixedCvesViaHTTP(r, url)
 		if err != nil {
 			return 0, err
@@ -89,8 +64,8 @@ func (deb Debian) DetectUnfixed(driver db.DB, r *models.ScanResult, _ bool) (nCV
 		if driver == nil {
 			return 0, nil
 		}
-		for _, pack := range scanResult.Packages {
-			cveDebs := driver.GetUnfixedCvesDebian(major(scanResult.Release), pack.Name)
+		for _, pack := range r.Packages {
+			cveDebs := driver.GetUnfixedCvesDebian(major(r.Release), pack.Name)
 			cves := []models.CveContent{}
 			for _, cveDeb := range cveDebs {
 				cves = append(cves, *deb.ConvertToModel(&cveDeb))
@@ -103,8 +78,8 @@ func (deb Debian) DetectUnfixed(driver db.DB, r *models.ScanResult, _ bool) (nCV
 		}

 		// SrcPack
-		for _, pack := range scanResult.SrcPackages {
-			cveDebs := driver.GetUnfixedCvesDebian(major(scanResult.Release), pack.Name)
+		for _, pack := range r.SrcPackages {
+			cveDebs := driver.GetUnfixedCvesDebian(major(r.Release), pack.Name)
 			cves := []models.CveContent{}
 			for _, cveDeb := range cveDebs {
 				cves = append(cves, *deb.ConvertToModel(&cveDeb))
--- a/gost/debian_test.go
+++ b/gost/debian_test.go
@@ -1,61 +0,0 @@
-package gost
-
-import "testing"
-
-func TestDebian_Supported(t *testing.T) {
-	type fields struct {
-		Base Base
-	}
-	type args struct {
-		major string
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			name: "8 is supported",
-			args: args{
-				major: "8",
-			},
-			want: true,
-		},
-		{
-			name: "9 is supported",
-			args: args{
-				major: "9",
-			},
-			want: true,
-		},
-		{
-			name: "10 is supported",
-			args: args{
-				major: "10",
-			},
-			want: true,
-		},
-		{
-			name: "11 is not supported yet",
-			args: args{
-				major: "11",
-			},
-			want: false,
-		},
-		{
-			name: "empty string is not supported yet",
-			args: args{
-				major: "",
-			},
-			want: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			deb := Debian{}
-			if got := deb.supported(tt.args.major); got != tt.want {
-				t.Errorf("Debian.Supported() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
--- a/gost/gost.go
+++ b/gost/gost.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package gost

 import (
@@ -25,7 +23,7 @@ func NewClient(family string) Client {
 	switch family {
 	case cnf.RedHat, cnf.CentOS:
 		return RedHat{}
-	case cnf.Debian, cnf.Raspbian:
+	case cnf.Debian:
 		return Debian{}
 	case cnf.Windows:
 		return Microsoft{}
--- a/gost/microsoft.go
+++ b/gost/microsoft.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package gost

 import (
@@ -28,20 +26,19 @@ func (ms Microsoft) DetectUnfixed(driver db.DB, r *models.ScanResult, _ bool) (n
 		if _, ok := r.ScannedCves[cveID]; !ok {
 			continue
 		}
-		cveCont, mitigations := ms.ConvertToModel(&msCve)
+		cveCont := ms.ConvertToModel(&msCve)
 		v, _ := r.ScannedCves[cveID]
 		if v.CveContents == nil {
 			v.CveContents = models.CveContents{}
 		}
 		v.CveContents[models.Microsoft] = *cveCont
-		v.Mitigations = append(v.Mitigations, mitigations...)
 		r.ScannedCves[cveID] = v
 	}
 	return len(cveIDs), nil
 }

 // ConvertToModel converts gost model to vuls model
-func (ms Microsoft) ConvertToModel(cve *gostmodels.MicrosoftCVE) (*models.CveContent, []models.Mitigation) {
+func (ms Microsoft) ConvertToModel(cve *gostmodels.MicrosoftCVE) *models.CveContent {
 	v3score := 0.0
 	var v3Vector string
 	for _, scoreSet := range cve.ScoreSets {
@@ -83,18 +80,6 @@ func (ms Microsoft) ConvertToModel(cve *gostmodels.MicrosoftCVE) (*models.CveCon
 		option["kbids"] = strings.Join(kbids, ",")
 	}

-	vendorURL := "https://msrc.microsoft.com/update-guide/vulnerability/" + cve.CveID
-	mitigations := []models.Mitigation{}
-	if cve.Mitigation != "" {
-		mitigations = []models.Mitigation{
-			{
-				CveContentType: models.Microsoft,
-				Mitigation:     cve.Mitigation,
-				URL:            vendorURL,
-			},
-		}
-	}
-
 	return &models.CveContent{
 		Type:          models.Microsoft,
 		CveID:         cve.CveID,
@@ -105,9 +90,10 @@ func (ms Microsoft) ConvertToModel(cve *gostmodels.MicrosoftCVE) (*models.CveCon
 		Cvss3Severity: v3Severity,
 		References:    refs,
 		CweIDs:        cwe,
+		Mitigation:    cve.Mitigation,
 		Published:     cve.PublishDate,
 		LastModified:  cve.LastUpdateDate,
-		SourceLink:    vendorURL,
+		SourceLink:    "https://portal.msrc.microsoft.com/ja-jp/security-guidance/advisory/" + cve.CveID,
 		Optional:      option,
-	}, mitigations
+	}
 }
--- a/gost/pseudo.go
+++ b/gost/pseudo.go
@@ -1,8 +1,8 @@
-// +build !scanner
-
 package gost

 import (
+	"strings"
+
 	"github.com/future-architect/vuls/models"
 	"github.com/knqyf263/gost/db"
 )
@@ -16,3 +16,7 @@ type Pseudo struct {
 func (pse Pseudo) DetectUnfixed(driver db.DB, r *models.ScanResult, _ bool) (int, error) {
 	return 0, nil
 }
+
+func major(osVer string) (majorVersion string) {
+	return strings.Split(osVer, ".")[0]
+}
--- a/gost/redhat.go
+++ b/gost/redhat.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package gost

 import (
@@ -48,7 +46,7 @@ func (red RedHat) fillFixed(driver db.DB, r *models.ScanResult) error {
 			if redCve.ID == 0 {
 				continue
 			}
-			cveCont, mitigations := red.ConvertToModel(&redCve)
+			cveCont := red.ConvertToModel(&redCve)
 			v, ok := r.ScannedCves[res.request.cveID]
 			if ok {
 				if v.CveContents == nil {
@@ -63,7 +61,6 @@ func (red RedHat) fillFixed(driver db.DB, r *models.ScanResult) error {
 					Confidences: models.Confidences{models.RedHatAPIMatch},
 				}
 			}
-			v.Mitigations = append(v.Mitigations, mitigations...)
 			r.ScannedCves[res.request.cveID] = v
 		}
 	} else {
@@ -74,7 +71,7 @@ func (red RedHat) fillFixed(driver db.DB, r *models.ScanResult) error {
 			if len(redCve.Name) == 0 {
 				continue
 			}
-			cveCont, mitigations := red.ConvertToModel(&redCve)
+			cveCont := red.ConvertToModel(&redCve)
 			v, ok := r.ScannedCves[cveID]
 			if ok {
 				if v.CveContents == nil {
@@ -89,7 +86,6 @@ func (red RedHat) fillFixed(driver db.DB, r *models.ScanResult) error {
 					Confidences: models.Confidences{models.RedHatAPIMatch},
 				}
 			}
-			v.Mitigations = append(v.Mitigations, mitigations...)
 			r.ScannedCves[cveID] = v
 		}
 	}
@@ -113,7 +109,7 @@ func (red RedHat) fillUnfixed(driver db.DB, r *models.ScanResult, ignoreWillNotF
 			}

 			for _, cve := range cves {
-				cveCont, mitigations := red.ConvertToModel(&cve)
+				cveCont := red.ConvertToModel(&cve)
 				v, ok := r.ScannedCves[cve.Name]
 				if ok {
 					if v.CveContents == nil {
@@ -129,7 +125,6 @@ func (red RedHat) fillUnfixed(driver db.DB, r *models.ScanResult, ignoreWillNotF
 					}
 					nCVEs++
 				}
-				v.Mitigations = append(v.Mitigations, mitigations...)
 				pkgStats := red.mergePackageStates(v,
 					cve.PackageState, r.Packages, r.Release)
 				if 0 < len(pkgStats) {
@@ -146,7 +141,7 @@ func (red RedHat) fillUnfixed(driver db.DB, r *models.ScanResult, ignoreWillNotF
 			// CVE-ID: RedhatCVE
 			cves := driver.GetUnfixedCvesRedhat(major(r.Release), pack.Name, ignoreWillNotFix)
 			for _, cve := range cves {
-				cveCont, mitigations := red.ConvertToModel(&cve)
+				cveCont := red.ConvertToModel(&cve)
 				v, ok := r.ScannedCves[cve.Name]
 				if ok {
 					if v.CveContents == nil {
@@ -162,7 +157,7 @@ func (red RedHat) fillUnfixed(driver db.DB, r *models.ScanResult, ignoreWillNotF
 					}
 					nCVEs++
 				}
-				v.Mitigations = append(v.Mitigations, mitigations...)
+
 				pkgStats := red.mergePackageStates(v,
 					cve.PackageState, r.Packages, r.Release)
 				if 0 < len(pkgStats) {
@@ -223,7 +218,7 @@ func (red RedHat) parseCwe(str string) (cwes []string) {
 }

 // ConvertToModel converts gost model to vuls model
-func (red RedHat) ConvertToModel(cve *gostmodels.RedhatCVE) (*models.CveContent, []models.Mitigation) {
+func (red RedHat) ConvertToModel(cve *gostmodels.RedhatCVE) *models.CveContent {
 	cwes := red.parseCwe(cve.Cwe)

 	details := []string{}
@@ -254,18 +249,6 @@ func (red RedHat) ConvertToModel(cve *gostmodels.RedhatCVE) (*models.CveContent,
 		refs = append(refs, models.Reference{Link: r.Reference})
 	}

-	vendorURL := "https://access.redhat.com/security/cve/" + cve.Name
-	mitigations := []models.Mitigation{}
-	if cve.Mitigation != "" {
-		mitigations = []models.Mitigation{
-			{
-				CveContentType: models.RedHatAPI,
-				Mitigation:     cve.Mitigation,
-				URL:            vendorURL,
-			},
-		}
-	}
-
 	return &models.CveContent{
 		Type:          models.RedHatAPI,
 		CveID:         cve.Name,
@@ -279,7 +262,8 @@ func (red RedHat) ConvertToModel(cve *gostmodels.RedhatCVE) (*models.CveContent,
 		Cvss3Severity: v3severity,
 		References:    refs,
 		CweIDs:        cwes,
+		Mitigation:    cve.Mitigation,
 		Published:     cve.PublicDate,
-		SourceLink:    vendorURL,
-	}, mitigations
+		SourceLink:    "https://access.redhat.com/security/cve/" + cve.Name,
+	}
 }
--- a/gost/util.go
+++ b/gost/util.go
@@ -2,7 +2,6 @@ package gost

 import (
 	"net/http"
-	"strings"
 	"time"

 	"github.com/cenkalti/backoff"
@@ -182,7 +181,3 @@ func httpGet(url string, req request, resChan chan<- response, errChan chan<- er
 		json:    body,
 	}
 }
-
-func major(osVer string) (majorVersion string) {
-	return strings.Split(osVer, ".")[0]
-}
--- a/img/hello-vuls-tui.png
+++ b/img/hello-vuls-tui.png
--- a/img/vuls-architecture-localscan.graphml
+++ b/img/vuls-architecture-localscan.graphml
--- a/img/vuls-architecture-localscan.png
+++ b/img/vuls-architecture-localscan.png
--- a/img/vuls-architecture.graphml
+++ b/img/vuls-architecture.graphml
--- a/img/vuls-architecture.png
+++ b/img/vuls-architecture.png
--- a/img/vuls-motivation.graphml
+++ b/img/vuls-motivation.graphml
--- a/img/vuls-scan-flow-fast.graphml
+++ b/img/vuls-scan-flow-fast.graphml
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
+  <!--Created by yEd 3.17-->
+  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
+  <key for="port" id="d1" yfiles.type="portgraphics"/>
+  <key for="port" id="d2" yfiles.type="portgeometry"/>
+  <key for="port" id="d3" yfiles.type="portuserdata"/>
+  <key attr.name="url" attr.type="string" for="node" id="d4"/>
+  <key attr.name="description" attr.type="string" for="node" id="d5"/>
+  <key for="node" id="d6" yfiles.type="nodegraphics"/>
+  <key for="graphml" id="d7" yfiles.type="resources"/>
+  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
+  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
+  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
+  <graph edgedefault="directed" id="G">
+    <data key="d0"/>
+    <node id="n0">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="309.6849206349206" y="0.0"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="83.482421875" x="92.2587890625" y="18.93359375">Detect the OS<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.5" nodeRatioX="0.0" nodeRatioY="0.1619001116071429" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n1">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.decision">
+          <y:Geometry height="40.0" width="80.0" x="403.6849206349206" y="206.44247787610618"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="38.0" y="18.0">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n2">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="90.44247787610618" width="268.0" x="309.6849206349206" y="86.0"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="right" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="88.796875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="170.763671875" x="48.61816406250006" y="0.8228014380530908">Get installed packages
+Alpine: apk
+Debian/Ubuntu: dpkg-query
+Amazon/RHEL/CentOS: rpm
+SUSE: zypper
+FreeBSD: pkg<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="2.220446049250313E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n3">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="609.3698412698412" y="630.0546766682629"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="152.634765625" x="57.6826171875" y="18.93359375">Write results to JSON files<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.5" nodeRatioX="0.0" nodeRatioY="0.1619001116071429" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n4">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="609.3698412698412" y="287.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="232.744140625" x="17.6279296875" y="4.80078125">Get CVE IDs by using package manager
+Amazon: yum plugin security
+FreeBSD: pkg audit<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n5">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="609.3698412698412" y="750.4705298628534"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="42.595703125" x="112.7021484375" y="18.93359375">Report<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n6" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="116.89483989807195" width="333.6788874841973" x="234.29467728596296" y="709.1901021013174"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="333.6788874841973" x="0.0" y="0.0">Vulnerability Database</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 1</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n6:">
+        <node id="n6::n0">
+          <data key="d6">
+            <y:GenericNode configuration="com.yworks.flowchart.dataBase">
+              <y:Geometry height="65.22882427307195" width="136.83944374209864" x="416.1341210280616" y="745.8561177263174"/>
+              <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="117.970703125" x="9.434370308549205" y="23.548005886535975">CVE DB (NVD / JVN)<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="-8.326672684688674E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+            </y:GenericNode>
+          </data>
+        </node>
+        <node id="n6::n1">
+          <data key="d6">
+            <y:GenericNode configuration="com.yworks.flowchart.dataBase">
+              <y:Geometry height="65.22882427307195" width="136.83944374209864" x="249.29467728596296" y="745.8561177263174"/>
+              <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="55.533203125" x="40.653120308549205" y="23.548005886535975">OVAL DB<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="-8.326672684688674E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+            </y:GenericNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n7">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="27.144753476611868" y="287.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="260.83984375" x="3.580078125" y="11.8671875">Check upgradable packages
+Debian/Ubuntu: apt-get upgrade --dry-run<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n8">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.loopLimit">
+          <y:Geometry height="51.10998735777497" width="137.19216182048035" x="92.54867256637169" y="376.28592169721867"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="131.751953125" x="2.7201043477401754" y="9.422181178887513">foreach 
+upgradable  packages<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="5.551115123125783E-16" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n9">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="27.144753476611868" y="459.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="213.619140625" x="27.1904296875" y="11.8671875">Parse changelog and get  CVE IDs
+Debian/Ubuntu: aptitude changelog<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n10">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.loopLimitEnd">
+          <y:Geometry height="50.0" width="137.0" x="92.64475347661187" y="545.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="55.24609375" x="40.876953125" y="15.93359375">end loop<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <edge id="e0" source="n2" target="n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="45.22123893805309" tx="0.0" ty="-20.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e1" source="n1" target="n4">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="40.0" sy="0.0" tx="0.0" ty="-28.0">
+            <y:Point x="743.3698412698412" y="226.44247787610618"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="right" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="51.806640625" x="183.35883739927397" y="2.000003510871693">Amazon
+FreeBSD<y:LabelModel>
+              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="1.9999999999998863" distanceToCenter="false" position="right" ratio="0.7796030035582084" segment="0"/>
+            </y:ModelParameter>
+            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+          </y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e2" source="n0" target="n2">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-45.22123893805309"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e3" source="n5" target="n6">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="10.8330078125"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e4" source="n1" target="n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="-123.36984126984123" ty="0.0">
+            <y:Point x="443.6849206349206" y="658.0546766682629"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="right" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="102.9296875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="77.078125" x="-97.68364242524859" y="5.005267793098369">Alpine Linux
+CentOS
+RHEL
+Ubuntu
+Debian
+Oracle Linux
+Suse<y:LabelModel>
+              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="59.14459455430983" distanceToCenter="true" position="right" ratio="0.0" segment="0"/>
+            </y:ModelParameter>
+            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+          </y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e5" source="n4" target="n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e6" source="n7" target="n8">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-25.554993678887485"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e7" source="n8" target="n9">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="25.554993678887485" tx="0.0" ty="-28.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e8" source="n9" target="n10">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-25.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e9" source="n3" target="n5">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e10" source="n1" target="n7">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+            <y:Point x="161.14475347661187" y="226.44247787610618"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="56.98046875" x="-196.80057112212188" y="20.933597260871807">Raspbian<y:LabelModel>
+              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.6447921222409765" segment="0"/>
+            </y:ModelParameter>
+            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+          </y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e11" source="n10" target="n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="-125.78842258255952" ty="0.0">
+            <y:Point x="161.14475347661187" y="658.0546766682629"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+  </graph>
+  <data key="d7">
+    <y:Resources/>
+  </data>
+</graphml>
--- a/img/vuls-scan-flow-fast.png
+++ b/img/vuls-scan-flow-fast.png
--- a/img/vuls-scan-flow.graphml
+++ b/img/vuls-scan-flow.graphml
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
+  <!--Created by yEd 3.17-->
+  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
+  <key for="port" id="d1" yfiles.type="portgraphics"/>
+  <key for="port" id="d2" yfiles.type="portgeometry"/>
+  <key for="port" id="d3" yfiles.type="portuserdata"/>
+  <key attr.name="url" attr.type="string" for="node" id="d4"/>
+  <key attr.name="description" attr.type="string" for="node" id="d5"/>
+  <key for="node" id="d6" yfiles.type="nodegraphics"/>
+  <key for="graphml" id="d7" yfiles.type="resources"/>
+  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
+  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
+  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
+  <graph edgedefault="directed" id="G">
+    <data key="d0"/>
+    <node id="n0">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="309.6849206349206" y="0.0"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="83.482421875" x="92.2587890625" y="18.93359375">Detect the OS<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.5" nodeRatioX="0.0" nodeRatioY="0.1619001116071429" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n1">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.decision">
+          <y:Geometry height="40.0" width="80.0" x="403.6849206349206" y="206.44247787610618"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="38.0" y="18.0">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n2">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="90.44247787610618" width="268.0" x="309.6849206349206" y="86.0"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="right" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="88.796875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="170.763671875" x="48.61816406250006" y="0.8228014380530908">Get installed packages
+Alpine Linux: apk
+Debian/Ubuntu: dpkg-query
+Amazon/RHEL/CentOS: rpm
+FreeBSD: pkg
+SUSE: zypper<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="2.220446049250313E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n3">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="10.0" y="287.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="260.83984375" x="3.580078125" y="11.8671875">Check upgradable packages
+Debian/Ubuntu: apt-get upgrade --dry-run<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n4">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.loopLimit">
+          <y:Geometry height="51.10998735777497" width="137.19216182048035" x="75.40391908975982" y="376.28592169721867"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="131.751953125" x="2.7201043477401754" y="9.422181178887513">foreach 
+upgradable  packages<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="5.551115123125783E-16" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n5">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="10.0" y="459.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="213.619140625" x="27.1904296875" y="11.8671875">Parse changelog and get  CVE IDs
+Debian/Ubuntu: aptitude changelog<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n6">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.loopLimitEnd">
+          <y:Geometry height="50.0" width="137.0" x="75.5" y="545.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="55.24609375" x="40.876953125" y="15.93359375">end loop<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n7">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="609.3698412698412" y="625.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="152.634765625" x="57.6826171875" y="18.93359375">Write results to JSON files<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.5" nodeRatioX="0.0" nodeRatioY="0.1619001116071429" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n8">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="609.3698412698412" y="287.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="232.744140625" x="17.6279296875" y="4.80078125">Get CVE IDs by using package manager
+Amazon/RHEL: yum plugin security
+FreeBSD: pkg audit<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n9">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="609.3698412698412" y="716.4553275126422"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="42.595703125" x="112.7021484375" y="18.93359375">Report<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n10">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="309.6849206349206" y="371.39590905499364"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="293.06640625" x="-12.533203124999943" y="11.8671875">Get all changelogs of updatable packages at once
+yum changelog<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="2.220446049250313E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n11">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="309.68492063492056" y="459.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="205.52734375" x="31.236328125000057" y="18.93359375">Parse changelogs and get CVE IDs <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.5" nodeRatioX="2.220446049250313E-16" nodeRatioY="0.1619001116071429" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n12">
+      <data key="d6">
+        <y:GenericNode configuration="com.yworks.flowchart.process">
+          <y:Geometry height="56.0" width="268.0" x="609.3698412698412" y="373.8409153761062"/>
+          <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="293.06640625" x="-12.533203124999886" y="11.8671875">Get all changelogs of updatable packages at once
+Amazon / RHEL: yum changelog<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="2.220446049250313E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n13" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="116.89483989807195" width="333.6788874841973" x="229.74083438685204" y="675.1748997511062"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="333.6788874841973" x="0.0" y="0.0">Vulnerability Database</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 1</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n13:">
+        <node id="n13::n0">
+          <data key="d6">
+            <y:GenericNode configuration="com.yworks.flowchart.dataBase">
+              <y:Geometry height="65.22882427307195" width="136.83944374209864" x="411.5802781289507" y="711.8409153761062"/>
+              <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="117.970703125" x="9.434370308549205" y="23.548005886535975">CVE DB (NVD / JVN)<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="-8.326672684688674E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+            </y:GenericNode>
+          </data>
+        </node>
+        <node id="n13::n1">
+          <data key="d6">
+            <y:GenericNode configuration="com.yworks.flowchart.dataBase">
+              <y:Geometry height="65.22882427307195" width="136.83944374209864" x="244.74083438685204" y="711.8409153761062"/>
+              <y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="55.533203125" x="40.653120308549205" y="23.548005886535975">OVAL DB<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="-8.326672684688674E-16" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+            </y:GenericNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <edge id="e0" source="n2" target="n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="45.22123893805309" tx="0.0" ty="-20.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e1" source="n1" target="n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-40.0" sy="0.0" tx="0.0" ty="-28.0">
+            <y:Point x="144.0" y="226.44247787610618"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="right" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="56.98046875" x="-257.65322875976574" y="2.0000035108718635">Debian
+Ubuntu
+Raspbian<y:LabelModel>
+              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="1.9999999999998863" distanceToCenter="false" position="left" ratio="0.8652035780364729" segment="0"/>
+            </y:ModelParameter>
+            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+          </y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e2" source="n3" target="n4">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-25.554993678887485"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e3" source="n4" target="n5">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="25.554993678887485" tx="0.0" ty="-28.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e4" source="n5" target="n6">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-25.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e5" source="n6" target="n7">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="68.5" sy="0.0" tx="0.0" ty="-28.0">
+            <y:Point x="743.3698412698412" y="570.8409153761062"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e6" source="n1" target="n8">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="40.0" sy="0.0" tx="0.0" ty="-28.0">
+            <y:Point x="743.3698412698412" y="226.44247787610618"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="right" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="51.806640625" x="200.87829463898197" y="4.000003510871693">Amazon
+RHEL
+FreeBSD<y:LabelModel>
+              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="6.999999999999886" distanceToCenter="false" position="right" ratio="0.8192728556300707" segment="-1"/>
+            </y:ModelParameter>
+            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+          </y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e7" source="n0" target="n2">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-45.22123893805309"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e8" source="n7" target="n9">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-28.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e9" source="n1" target="n10">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="20.0" tx="0.0" ty="-28.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="46.708984375" x="-53.35447755843876" y="5.000003510871807">CentOS<y:LabelModel>
+              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="right" ratio="0.0" segment="0"/>
+            </y:ModelParameter>
+            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+          </y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e10" source="n10" target="n11">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="28.0" tx="0.0" ty="-28.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e11" source="n11" target="n7">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="-24.34091537610618">
+            <y:Point x="743.3698412698412" y="487.8409153761062"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e12" source="n8" target="n12">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e13" source="n12" target="n7">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e14" source="n9" target="n13">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="10.8330078125"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e15" source="n1" target="n7">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+            <y:Point x="999.0" y="226.44247787610618"/>
+            <y:Point x="999.0" y="570.8409153761062"/>
+            <y:Point x="743.3698412698412" y="570.8409153761062"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:EdgeLabel alignment="right" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="76.8203125" x="422.923942251054" y="13.867191010871807">Alpine Linux
+SUSE<y:LabelModel>
+              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="right" ratio="0.8856709076027529" segment="0"/>
+            </y:ModelParameter>
+            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
+          </y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+  </graph>
+  <data key="d7">
+    <y:Resources/>
+  </data>
+</graphml>
--- a/img/vuls-scan-flow.png
+++ b/img/vuls-scan-flow.png
--- a/img/vuls-slack-ja.png
+++ b/img/vuls-slack-ja.png
--- a/img/vuls-usecase-elb-rails-rds-all.graphml
+++ b/img/vuls-usecase-elb-rails-rds-all.graphml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
+  <!--Created by yEd 3.14.2-->
+  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
+  <key for="port" id="d1" yfiles.type="portgraphics"/>
+  <key for="port" id="d2" yfiles.type="portgeometry"/>
+  <key for="port" id="d3" yfiles.type="portuserdata"/>
+  <key attr.name="url" attr.type="string" for="node" id="d4"/>
+  <key attr.name="description" attr.type="string" for="node" id="d5"/>
+  <key for="node" id="d6" yfiles.type="nodegraphics"/>
+  <key for="graphml" id="d7" yfiles.type="resources"/>
+  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
+  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
+  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
+  <graph edgedefault="directed" id="G">
+    <data key="d0"/>
+    <node id="n0">
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="50.0" width="73.25" x="478.6165008544913" y="1358.206868489578"/>
+          <y:Fill color="#C0C0C0" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="28.87890625" x="22.185546875" y="15.93359375">Vuls<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="roundrectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n1">
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="50.0" width="73.25" x="711.9623756408686" y="1043.7241210937468"/>
+          <y:Fill color="#C0C0C0" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="38.623046875" x="17.3134765625" y="15.93359375">Nginx<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="roundrectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n2">
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="50.0" width="73.25" x="711.9623756408686" y="1287.206868489578"/>
+          <y:Fill color="#C0C0C0" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="42.7890625" x="15.23046875" y="15.93359375">MySQL<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="roundrectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n3" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="101.666015625" width="291.7208747863772" x="602.72693824768" y="1146.2994791666624"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="291.7208747863772" x="0.0" y="0.0">Web/App</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="23" leftF="23.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 5</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n3:">
+        <node id="n3::n0">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="50.0" width="73.25" x="640.72693824768" y="1182.9654947916624"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="31.26953125" x="20.990234375" y="15.93359375">Rails<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n3::n1">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="50.0" width="73.25" x="723.4623756408686" y="1182.9654947916624"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="31.26953125" x="20.990234375" y="15.93359375">Rails<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n3::n2">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="50.0" width="73.25" x="806.1978130340572" y="1182.9654947916624"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="31.26953125" x="20.990234375" y="15.93359375">Rails<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n4">
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="50.0" width="73.25" x="821.1978130340572" y="1287.206868489578"/>
+          <y:Fill color="#C0C0C0" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="35.412109375" x="18.9189453125" y="15.93359375">Redis<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="roundrectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <edge id="e0" source="n3" target="n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e1" source="n3" target="n2">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e2" source="n0" target="n3::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e3" source="n0" target="n3::n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e4" source="n0" target="n3::n2">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e5" source="n3" target="n4">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e6" source="n0" target="n4">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e7" source="n0" target="n1">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e8" source="n0" target="n2">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+  </graph>
+  <data key="d7">
+    <y:Resources/>
+  </data>
+</graphml>
--- a/img/vuls-usecase-elb-rails-rds-all.png
+++ b/img/vuls-usecase-elb-rails-rds-all.png
--- a/img/vuls-usecase-elb-rails-rds-single.graphml
+++ b/img/vuls-usecase-elb-rails-rds-single.graphml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
+  <!--Created by yEd 3.14.2-->
+  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
+  <key for="port" id="d1" yfiles.type="portgraphics"/>
+  <key for="port" id="d2" yfiles.type="portgeometry"/>
+  <key for="port" id="d3" yfiles.type="portuserdata"/>
+  <key attr.name="url" attr.type="string" for="node" id="d4"/>
+  <key attr.name="description" attr.type="string" for="node" id="d5"/>
+  <key for="node" id="d6" yfiles.type="nodegraphics"/>
+  <key for="graphml" id="d7" yfiles.type="resources"/>
+  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
+  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
+  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
+  <graph edgedefault="directed" id="G">
+    <data key="d0"/>
+    <node id="n0">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="50.0" width="73.25" x="508.30825042724564" y="1132.4827473958312"/>
+          <y:Fill color="#C0C0C0" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="28.87890625" x="22.185546875" y="15.93359375">Vuls<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="roundrectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n1">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="50.0" width="73.25" x="749.6541252136229" y="993.2413736979156"/>
+          <y:Fill color="#C0C0C0" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="23.8046875" x="24.72265625" y="15.93359375">ELB<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="roundrectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n2">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="50.0" width="73.25" x="749.6541252136229" y="1236.7241210937468"/>
+          <y:Fill color="#C0C0C0" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="27.0390625" x="23.10546875" y="15.93359375">RDS<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="roundrectangle"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n3" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d5"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="101.666015625" width="291.7208747863772" x="640.4186878204343" y="1095.8167317708312"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="291.7208747863772" x="0.0" y="0.0">Web/App</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="23" leftF="23.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 5</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n3:">
+        <node id="n3::n0">
+          <data key="d5"/>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="50.0" width="73.25" x="678.4186878204343" y="1132.4827473958312"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="31.26953125" x="20.990234375" y="15.93359375">Rails<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n3::n1">
+          <data key="d5"/>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="50.0" width="73.25" x="761.1541252136229" y="1132.4827473958312"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="31.26953125" x="20.990234375" y="15.93359375">Rails<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n3::n2">
+          <data key="d5"/>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="50.0" width="73.25" x="843.8895626068115" y="1132.4827473958312"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="31.26953125" x="20.990234375" y="15.93359375">Rails<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <edge id="e0" source="n3" target="n1">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e1" source="n3" target="n2">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="none"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e2" source="n0" target="n3::n0">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+  </graph>
+  <data key="d7">
+    <y:Resources/>
+  </data>
+</graphml>
--- a/img/vuls-usecase-elb-rails-rds-single.png
+++ b/img/vuls-usecase-elb-rails-rds-single.png
--- a/libmanager/libManager.go
+++ b/libmanager/libManager.go
@@ -17,9 +17,8 @@ import (
 	"github.com/future-architect/vuls/util"
 )

-// DetectLibsCves fills LibraryScanner information
-func DetectLibsCves(r *models.ScanResult) (err error) {
-	totalCnt := 0
+// FillLibrary fills LibraryScanner informations
+func FillLibrary(r *models.ScanResult) (totalCnt int, err error) {
 	if len(r.LibraryScanners) == 0 {
 		return
 	}
@@ -27,40 +26,32 @@ func DetectLibsCves(r *models.ScanResult) (err error) {
 	// initialize trivy's logger and db
 	err = log.InitLogger(false, false)
 	if err != nil {
-		return err
+		return 0, err
 	}

 	util.Log.Info("Updating library db...")
 	if err := downloadDB(config.Version, config.Conf.TrivyCacheDBDir, config.Conf.NoProgress, false, false); err != nil {
-		return err
+		return 0, err
 	}

 	if err := db2.Init(config.Conf.TrivyCacheDBDir); err != nil {
-		return err
+		return 0, err
 	}
 	defer db2.Close()

 	for _, lib := range r.LibraryScanners {
 		vinfos, err := lib.Scan()
 		if err != nil {
-			return err
+			return 0, err
 		}
 		for _, vinfo := range vinfos {
 			vinfo.Confidences.AppendIfMissing(models.TrivyMatch)
-			if v, ok := r.ScannedCves[vinfo.CveID]; !ok {
-				r.ScannedCves[vinfo.CveID] = vinfo
-			} else {
-				v.LibraryFixedIns = append(v.LibraryFixedIns, vinfo.LibraryFixedIns...)
-				r.ScannedCves[vinfo.CveID] = v
-			}
+			r.ScannedCves[vinfo.CveID] = vinfo
 		}
 		totalCnt += len(vinfos)
 	}

-	util.Log.Infof("%s: %d CVEs are detected with Library",
-		r.FormatServerName(), totalCnt)
-
-	return nil
+	return totalCnt, nil
 }

 func downloadDB(appVersion, cacheDir string, quiet, light, skipUpdate bool) error {
--- a/cmd/vuls/main.go
+++ b/cmd/vuls/main.go
@@ -7,8 +7,8 @@ import (

 	"context"

+	"github.com/future-architect/vuls/commands"
 	"github.com/future-architect/vuls/config"
-	commands "github.com/future-architect/vuls/subcmds"
 	"github.com/google/subcommands"
 )

--- a/models/cvecontents.go
+++ b/models/cvecontents.go
@@ -42,23 +42,15 @@ func (v CveContents) Except(exceptCtypes ...CveContentType) (values CveContents)
 	return
 }

-// PrimarySrcURLs returns link of source
-func (v CveContents) PrimarySrcURLs(lang, myFamily, cveID string) (values []CveContentStr) {
-	if cveID == "" {
-		return
-	}
-
-	if cont, found := v[Nvd]; found {
-		for _, r := range cont.References {
-			for _, t := range r.Tags {
-				if t == "Vendor Advisory" {
-					values = append(values, CveContentStr{Nvd, r.Link})
-				}
-			}
+// SourceLinks returns link of source
+func (v CveContents) SourceLinks(lang, myFamily, cveID string) (values []CveContentStr) {
+	if lang == "ja" {
+		if cont, found := v[Jvn]; found && 0 < len(cont.SourceLink) {
+			values = append(values, CveContentStr{Jvn, cont.SourceLink})
 		}
 	}

-	order := CveContentTypes{Nvd, NewCveContentType(myFamily)}
+	order := CveContentTypes{Nvd, NvdXML, NewCveContentType(myFamily)}
 	for _, ctype := range order {
 		if cont, found := v[ctype]; found {
 			if cont.SourceLink == "" {
@@ -68,12 +60,6 @@ func (v CveContents) PrimarySrcURLs(lang, myFamily, cveID string) (values []CveC
 		}
 	}

-	if lang == "ja" {
-		if cont, found := v[Jvn]; found && 0 < len(cont.SourceLink) {
-			values = append(values, CveContentStr{Jvn, cont.SourceLink})
-		}
-	}
-
 	if len(values) == 0 {
 		return []CveContentStr{{
 			Type:  Nvd,
@@ -83,22 +69,6 @@ func (v CveContents) PrimarySrcURLs(lang, myFamily, cveID string) (values []CveC
 	return values
 }

-// PatchURLs returns link of patch
-func (v CveContents) PatchURLs() (urls []string) {
-	cont, found := v[Nvd]
-	if !found {
-		return
-	}
-	for _, r := range cont.References {
-		for _, t := range r.Tags {
-			if t == "Patch" {
-				urls = append(urls, r.Link)
-			}
-		}
-	}
-	return
-}
-
 /*
 // Severities returns Severities
 func (v CveContents) Severities(myFamily string) (values []CveContentStr) {
@@ -214,6 +184,7 @@ type CveContent struct {
 	CweIDs        []string          `json:"cweIDs,omitempty"`
 	Published     time.Time         `json:"published"`
 	LastModified  time.Time         `json:"lastModified"`
+	Mitigation    string            `json:"mitigation"` // RedHat API
 	Optional      map[string]string `json:"optional,omitempty"`
 }

@@ -228,6 +199,8 @@ type CveContentType string
 // NewCveContentType create CveContentType
 func NewCveContentType(name string) CveContentType {
 	switch name {
+	case "nvdxml":
+		return NvdXML
 	case "nvd":
 		return Nvd
 	case "jvn":
@@ -252,13 +225,26 @@ func NewCveContentType(name string) CveContentType {
 		return Amazon
 	case "trivy":
 		return Trivy
+	// case vulnerability.NodejsSecurityWg:
+	// 	return NodeSec
+	// case vulnerability.PythonSafetyDB:
+	// 	return PythonSec
+	// case vulnerability.RustSec:
+	// 	return RustSec
+	// case vulnerability.PhpSecurityAdvisories:
+	// 	return PhpSec
+	// case vulnerability.RubySec:
+	// 	return RubySec
 	default:
 		return Unknown
 	}
 }

 const (
-	// Nvd is Nvd JSON
+	// NvdXML is NvdXML
+	NvdXML CveContentType = "nvdxml"
+
+	// Nvd is Nvd
 	Nvd CveContentType = "nvd"

 	// Jvn is Jvn
@@ -270,7 +256,7 @@ const (
 	// RedHatAPI is RedHat
 	RedHatAPI CveContentType = "redhat_api"

-	// DebianSecurityTracker is Debian Security tracker
+	// DebianSecurityTracker is Debian Secury tracker
 	DebianSecurityTracker CveContentType = "debian_security_tracker"

 	// Debian is Debian
@@ -297,6 +283,21 @@ const (
 	// Trivy is Trivy
 	Trivy CveContentType = "trivy"

+	// NodeSec : for JS
+	// NodeSec CveContentType = "node"
+
+	// // PythonSec : for PHP
+	// PythonSec CveContentType = "python"
+
+	// // PhpSec : for PHP
+	// PhpSec CveContentType = "php"
+
+	// // RubySec : for Ruby
+	// RubySec CveContentType = "ruby"
+
+	// // RustSec : for Rust
+	// RustSec CveContentType = "rust"
+
 	// Unknown is Unknown
 	Unknown CveContentType = "unknown"
 )
@@ -307,6 +308,7 @@ type CveContentTypes []CveContentType
 // AllCveContetTypes has all of CveContentTypes
 var AllCveContetTypes = CveContentTypes{
 	Nvd,
+	NvdXML,
 	Jvn,
 	RedHat,
 	RedHatAPI,
@@ -317,6 +319,11 @@ var AllCveContetTypes = CveContentTypes{
 	DebianSecurityTracker,
 	WPVulnDB,
 	Trivy,
+	// NodeSec,
+	// PythonSec,
+	// PhpSec,
+	// RubySec,
+	// RustSec,
 }

 // Except returns CveContentTypes except for given args
@@ -347,8 +354,7 @@ type References []Reference

 // Reference has a related link of the CVE
 type Reference struct {
-	Link   string   `json:"link,omitempty"`
-	Source string   `json:"source,omitempty"`
-	RefID  string   `json:"refID,omitempty"`
-	Tags   []string `json:"tags,omitempty"`
+	Source string `json:"source"`
+	Link   string `json:"link"`
+	RefID  string `json:"refID"`
 }
--- a/models/cvecontents_test.go
+++ b/models/cvecontents_test.go
@@ -52,43 +52,25 @@ func TestSourceLinks(t *testing.T) {
 						Type:       RedHat,
 						SourceLink: "https://access.redhat.com/security/cve/CVE-2017-6074",
 					},
-					Nvd: {
-						Type: Nvd,
-						References: []Reference{
-							{
-								Link:   "https://lists.apache.org/thread.html/765be3606d865de513f6df9288842c3cf58b09a987c617a535f2b99d@%3Cusers.tapestry.apache.org%3E",
-								Source: "",
-								RefID:  "",
-								Tags:   []string{"Vendor Advisory"},
-							},
-							{
-								Link:   "http://yahoo.com",
-								Source: "",
-								RefID:  "",
-								Tags:   []string{"Vendor"},
-							},
-						},
+					NvdXML: {
+						Type:       NvdXML,
 						SourceLink: "https://nvd.nist.gov/vuln/detail/CVE-2017-6074",
 					},
 				},
 			},
 			out: []CveContentStr{
 				{
-					Type:  Nvd,
-					Value: "https://lists.apache.org/thread.html/765be3606d865de513f6df9288842c3cf58b09a987c617a535f2b99d@%3Cusers.tapestry.apache.org%3E",
+					Type:  Jvn,
+					Value: "https://jvn.jp/vu/JVNVU93610402/",
 				},
 				{
-					Type:  Nvd,
+					Type:  NvdXML,
 					Value: "https://nvd.nist.gov/vuln/detail/CVE-2017-6074",
 				},
 				{
 					Type:  RedHat,
 					Value: "https://access.redhat.com/security/cve/CVE-2017-6074",
 				},
-				{
-					Type:  Jvn,
-					Value: "https://jvn.jp/vu/JVNVU93610402/",
-				},
 			},
 		},
 		// lang: en
@@ -105,9 +87,17 @@ func TestSourceLinks(t *testing.T) {
 						Type:       RedHat,
 						SourceLink: "https://access.redhat.com/security/cve/CVE-2017-6074",
 					},
+					NvdXML: {
+						Type:       NvdXML,
+						SourceLink: "https://nvd.nist.gov/vuln/detail/CVE-2017-6074",
+					},
 				},
 			},
 			out: []CveContentStr{
+				{
+					Type:  NvdXML,
+					Value: "https://nvd.nist.gov/vuln/detail/CVE-2017-6074",
+				},
 				{
 					Type:  RedHat,
 					Value: "https://access.redhat.com/security/cve/CVE-2017-6074",
@@ -130,9 +120,71 @@ func TestSourceLinks(t *testing.T) {
 		},
 	}
 	for i, tt := range tests {
-		actual := tt.in.cont.PrimarySrcURLs(tt.in.lang, "redhat", tt.in.cveID)
+		actual := tt.in.cont.SourceLinks(tt.in.lang, "redhat", tt.in.cveID)
 		if !reflect.DeepEqual(tt.out, actual) {
 			t.Errorf("\n[%d] expected: %v\n  actual: %v\n", i, tt.out, actual)
 		}
 	}
 }
+
+func TestVendorLink(t *testing.T) {
+	type in struct {
+		family string
+		vinfo  VulnInfo
+	}
+	var tests = []struct {
+		in  in
+		out map[string]string
+	}{
+		{
+			in: in{
+				family: "redhat",
+				vinfo: VulnInfo{
+					CveID: "CVE-2017-6074",
+					CveContents: CveContents{
+						Jvn: {
+							Type:       Jvn,
+							SourceLink: "https://jvn.jp/vu/JVNVU93610402/",
+						},
+						RedHat: {
+							Type:       RedHat,
+							SourceLink: "https://access.redhat.com/security/cve/CVE-2017-6074",
+						},
+						NvdXML: {
+							Type:       NvdXML,
+							SourceLink: "https://nvd.nist.gov/vuln/detail/CVE-2017-6074",
+						},
+					},
+				},
+			},
+			out: map[string]string{
+				"RHEL-CVE": "https://access.redhat.com/security/cve/CVE-2017-6074",
+			},
+		},
+		{
+			in: in{
+				family: "ubuntu",
+				vinfo: VulnInfo{
+					CveID: "CVE-2017-6074",
+					CveContents: CveContents{
+						RedHat: {
+							Type:       Ubuntu,
+							SourceLink: "https://access.redhat.com/security/cve/CVE-2017-6074",
+						},
+					},
+				},
+			},
+			out: map[string]string{
+				"Ubuntu-CVE": "http://people.ubuntu.com/~ubuntu-security/cve/CVE-2017-6074",
+			},
+		},
+	}
+	for _, tt := range tests {
+		actual := tt.in.vinfo.VendorLinks(tt.in.family)
+		for k := range tt.out {
+			if tt.out[k] != actual[k] {
+				t.Errorf("\nexpected: %s\n  actual: %s\n", tt.out[k], actual[k])
+			}
+		}
+	}
+}
--- a/models/library.go
+++ b/models/library.go
@@ -10,18 +10,20 @@ import (
 	"github.com/aquasecurity/trivy/pkg/types"
 	"github.com/future-architect/vuls/util"
 	"golang.org/x/xerrors"
+
 	// "github.com/aquasecurity/go-dep-parser/pkg/types"
+	"github.com/knqyf263/go-version"
 )

 // LibraryScanners is an array of LibraryScanner
 type LibraryScanners []LibraryScanner

 // Find : find by name
-func (lss LibraryScanners) Find(path, name string) map[string]types.Library {
+func (lss LibraryScanners) Find(name string) map[string]types.Library {
 	filtered := map[string]types.Library{}
 	for _, ls := range lss {
 		for _, lib := range ls.Libs {
-			if ls.Path == path && lib.Name == name {
+			if lib.Name == name {
 				filtered[ls.Path] = lib
 				break
 			}
@@ -38,13 +40,20 @@ type LibraryScanner struct {

 // Scan : scan target library
 func (s LibraryScanner) Scan() ([]VulnInfo, error) {
-	scanner, err := library.DriverFactory{}.NewDriver(filepath.Base(string(s.Path)))
-	if err != nil {
-		return nil, xerrors.Errorf("Failed to new a library driver: %w", err)
+	scanner := library.DriverFactory{}.NewDriver(filepath.Base(string(s.Path)))
+	if scanner == nil {
+		return nil, xerrors.New("unknown file type")
 	}
+
 	var vulnerabilities = []VulnInfo{}
 	for _, pkg := range s.Libs {
-		tvulns, err := scanner.Detect(pkg.Name, pkg.Version)
+		v, err := version.NewVersion(pkg.Version)
+		if err != nil {
+			util.Log.Debugf("new version cant detected %s@%s", pkg.Name, pkg.Version)
+			continue
+		}
+
+		tvulns, err := scanner.Detect(pkg.Name, v)
 		if err != nil {
 			return nil, xerrors.Errorf("failed to detect %s vulnerabilities: %w", scanner.Type(), err)
 		}
@@ -63,7 +72,7 @@ func (s LibraryScanner) convertFanalToVuln(tvulns []types.DetectedVulnerability)
 	for _, tvuln := range tvulns {
 		vinfo, err := s.getVulnDetail(tvuln)
 		if err != nil {
-			util.Log.Debugf("failed to getVulnDetail. err: %s, tvuln: %#v", err, tvuln)
+			util.Log.Debugf("failed to getVulnDetail. err: %s, tvun: %#v", err, tvuln)
 			continue
 		}
 		vulns = append(vulns, vinfo)
@@ -85,7 +94,6 @@ func (s LibraryScanner) getVulnDetail(tvuln types.DetectedVulnerability) (vinfo
 				Key:     s.GetLibraryKey(),
 				Name:    tvuln.PkgName,
 				FixedIn: tvuln.FixedVersion,
-				Path:    s.Path,
 			},
 		}
 	}
@@ -133,5 +141,4 @@ type LibraryFixedIn struct {
 	Key     string `json:"key,omitempty"`
 	Name    string `json:"name,omitempty"`
 	FixedIn string `json:"fixedIn,omitempty"`
-	Path    string `json:"path,omitempty"`
 }
--- a/models/library_test.go
+++ b/models/library_test.go
@@ -9,7 +9,6 @@ import (

 func TestLibraryScanners_Find(t *testing.T) {
 	type args struct {
-		path string
 		name string
 	}
 	tests := []struct {
@@ -31,7 +30,7 @@ func TestLibraryScanners_Find(t *testing.T) {
 					},
 				},
 			},
-			args: args{"/pathA", "libA"},
+			args: args{"libA"},
 			want: map[string]types.Library{
 				"/pathA": {
 					Name:    "libA",
@@ -61,12 +60,16 @@ func TestLibraryScanners_Find(t *testing.T) {
 					},
 				},
 			},
-			args: args{"/pathA", "libA"},
+			args: args{"libA"},
 			want: map[string]types.Library{
 				"/pathA": {
 					Name:    "libA",
 					Version: "1.0.0",
 				},
+				"/pathB": {
+					Name:    "libA",
+					Version: "1.0.5",
+				},
 			},
 		},
 		{
@@ -82,13 +85,13 @@ func TestLibraryScanners_Find(t *testing.T) {
 					},
 				},
 			},
-			args: args{"/pathA", "libB"},
+			args: args{"libB"},
 			want: map[string]types.Library{},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := tt.lss.Find(tt.args.path, tt.args.name); !reflect.DeepEqual(got, tt.want) {
+			if got := tt.lss.Find(tt.args.name); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("LibraryScanners.Find() = %v, want %v", got, tt.want)
 			}
 		})
--- a/models/packages.go
+++ b/models/packages.go
@@ -3,7 +3,6 @@ package models
 import (
 	"bytes"
 	"fmt"
-	"regexp"
 	"strings"

 	"golang.org/x/xerrors"
@@ -174,44 +173,9 @@ type Changelog struct {

 // AffectedProcess keep a processes information affected by software update
 type AffectedProcess struct {
-	PID             string     `json:"pid,omitempty"`
-	Name            string     `json:"name,omitempty"`
-	ListenPorts     []string   `json:"listenPorts,omitempty"`
-	ListenPortStats []PortStat `json:"listenPortStats,omitempty"`
-}
-
-// PortStat has the result of parsing the port information to the address and port.
-type PortStat struct {
-	BindAddress     string   `json:"bindAddress"`
-	Port            string   `json:"port"`
-	PortReachableTo []string `json:"portReachableTo"`
-}
-
-// NewPortStat create a PortStat from ipPort str
-func NewPortStat(ipPort string) (*PortStat, error) {
-	if ipPort == "" {
-		return &PortStat{}, nil
-	}
-	sep := strings.LastIndex(ipPort, ":")
-	if sep == -1 {
-		return nil, xerrors.Errorf("Failed to parse IP:Port: %s", ipPort)
-	}
-	return &PortStat{
-		BindAddress: ipPort[:sep],
-		Port:        ipPort[sep+1:],
-	}, nil
-}
-
-// HasReachablePort checks if Package.AffectedProcs has PortReachableTo
-func (p Package) HasReachablePort() bool {
-	for _, ap := range p.AffectedProcs {
-		for _, lp := range ap.ListenPortStats {
-			if len(lp.PortReachableTo) > 0 {
-				return true
-			}
-		}
-	}
-	return false
+	PID         string   `json:"pid,omitempty"`
+	Name        string   `json:"name,omitempty"`
+	ListenPorts []string `json:"listenPorts,omitempty"`
 }

 // NeedRestartProcess keep a processes information affected by software update
@@ -263,28 +227,3 @@ func (s SrcPackages) FindByBinName(name string) (*SrcPackage, bool) {
 	}
 	return nil, false
 }
-
-// raspiPackNamePattern is a regular expression pattern to detect the Raspberry Pi specific package from the package name.
-// e.g. libraspberrypi-dev, rpi-eeprom, python3-rpi.gpio, pi-bluetooth
-var raspiPackNamePattern = regexp.MustCompile(`(.*raspberry.*|^rpi.*|.*-rpi.*|^pi-.*)`)
-
-// raspiPackNamePattern is a regular expression pattern to detect the Raspberry Pi specific package from the version.
-// e.g. ffmpeg 7:4.1.4-1+rpt7~deb10u1, vlc 3.0.10-0+deb10u1+rpt2
-var raspiPackVersionPattern = regexp.MustCompile(`.+\+rp(t|i)\d+`)
-
-// raspiPackNameList is a package name array of Raspberry Pi specific packages that are difficult to detect with regular expressions.
-var raspiPackNameList = []string{"piclone", "pipanel", "pishutdown", "piwiz", "pixflat-icons"}
-
-// IsRaspbianPackage judges whether it is a package related to Raspberry Pi from the package name and version
-func IsRaspbianPackage(name, version string) bool {
-	if raspiPackNamePattern.MatchString(name) || raspiPackVersionPattern.MatchString(version) {
-		return true
-	}
-	for _, n := range raspiPackNameList {
-		if n == name {
-			return true
-		}
-	}
-
-	return false
-}
--- a/models/packages_test.go
+++ b/models/packages_test.go
@@ -297,134 +297,3 @@ func TestPackage_FormatVersionFromTo(t *testing.T) {
 		})
 	}
 }
-
-func Test_IsRaspbianPackage(t *testing.T) {
-	type args struct {
-		name string
-		ver  string
-	}
-	tests := []struct {
-		name   string
-		in     []args
-		expect []bool
-	}{
-		{
-			name: "nameRegExp",
-			in: []args{
-				{
-					name: "libraspberrypi-dev",
-					ver:  "1.20200811-1",
-				},
-				{
-					name: "rpi-eeprom",
-					ver:  "7.10-1",
-				},
-				{
-					name: "python3-rpi.gpio",
-					ver:  "0.7.0-0.1~bpo10+1",
-				},
-				{
-					name: "arping",
-					ver:  "2.19-6",
-				},
-				{
-					name: "pi-bluetooth",
-					ver:  "0.1.14",
-				},
-			},
-			expect: []bool{true, true, true, false, true, false},
-		},
-		{
-			name: "verRegExp",
-			in: []args{
-				{
-					name: "ffmpeg",
-					ver:  "7:4.1.6-1~deb10u1+rpt1",
-				},
-				{
-					name: "gcc",
-					ver:  "4:8.3.0-1+rpi2",
-				},
-			},
-			expect: []bool{true, true},
-		},
-		{
-			name: "nameList",
-			in: []args{
-				{
-					name: "piclone",
-					ver:  "0.16",
-				},
-			},
-			expect: []bool{true},
-		},
-		{
-			name: "debianPackage",
-			in: []args{
-				{
-					name: "apt",
-					ver:  "1.8.2.1",
-				},
-			},
-			expect: []bool{false},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			for i, p := range tt.in {
-				ret := IsRaspbianPackage(p.name, p.ver)
-				if !reflect.DeepEqual(ret, tt.expect[i]) {
-					t.Errorf("[%s->%s] expected: %t, actual: %t, in: %#v", tt.name, tt.in[i].name, tt.expect[i], ret, tt.in[i])
-				}
-			}
-		})
-	}
-}
-
-func Test_parseListenPorts(t *testing.T) {
-	tests := []struct {
-		name   string
-		args   string
-		expect PortStat
-	}{{
-		name: "empty",
-		args: "",
-		expect: PortStat{
-			BindAddress: "",
-			Port:        "",
-		},
-	}, {
-		name: "normal",
-		args: "127.0.0.1:22",
-		expect: PortStat{
-			BindAddress: "127.0.0.1",
-			Port:        "22",
-		},
-	}, {
-		name: "asterisk",
-		args: "*:22",
-		expect: PortStat{
-			BindAddress: "*",
-			Port:        "22",
-		},
-	}, {
-		name: "ipv6_loopback",
-		args: "[::1]:22",
-		expect: PortStat{
-			BindAddress: "[::1]",
-			Port:        "22",
-		},
-	}}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			listenPort, err := NewPortStat(tt.args)
-			if err != nil {
-				t.Errorf("unexpected error occurred: %s", err)
-			} else if !reflect.DeepEqual(*listenPort, tt.expect) {
-				t.Errorf("base.parseListenPorts() = %v, want %v", *listenPort, tt.expect)
-			}
-		})
-	}
-}
--- a/models/scanresults.go
+++ b/models/scanresults.go
@@ -3,7 +3,6 @@ package models
 import (
 	"bytes"
 	"fmt"
-	"reflect"
 	"regexp"
 	"strings"
 	"time"
@@ -217,7 +216,7 @@ func (r ScanResult) FilterIgnorePkgs() ScanResult {
 	for _, pkgRegexp := range ignorePkgsRegexps {
 		re, err := regexp.Compile(pkgRegexp)
 		if err != nil {
-			util.Log.Errorf("Failed to parse %s. err: %+v", pkgRegexp, err)
+			util.Log.Errorf("Faild to parse %s. err: %+v", pkgRegexp, err)
 			continue
 		} else {
 			regexps = append(regexps, re)
@@ -340,21 +339,20 @@ func (r ScanResult) FormatServerName() (name string) {
 	return
 }

-// FormatTextReportHeader returns header of text report
-func (r ScanResult) FormatTextReportHeader() string {
+// FormatTextReportHeadedr returns header of text report
+func (r ScanResult) FormatTextReportHeadedr() string {
 	var buf bytes.Buffer
 	for i := 0; i < len(r.ServerInfo()); i++ {
 		buf.WriteString("=")
 	}

-	return fmt.Sprintf("%s\n%s\n%s, %s, %s, %s, %s, %s\n",
+	return fmt.Sprintf("%s\n%s\n%s, %s, %s, %s, %s\n",
 		r.ServerInfo(),
 		buf.String(),
 		r.ScannedCves.FormatCveSummary(),
 		r.ScannedCves.FormatFixedStatus(r.Packages),
 		r.FormatUpdatablePacksSummary(),
 		r.FormatExploitCveSummary(),
-		r.FormatMetasploitCveSummary(),
 		r.FormatAlertSummary(),
 	)
 }
@@ -390,18 +388,7 @@ func (r ScanResult) FormatExploitCveSummary() string {
 	return fmt.Sprintf("%d exploits", nExploitCve)
 }

-// FormatMetasploitCveSummary returns a summary of exploit cve
-func (r ScanResult) FormatMetasploitCveSummary() string {
-	nMetasploitCve := 0
-	for _, vuln := range r.ScannedCves {
-		if 0 < len(vuln.Metasploits) {
-			nMetasploitCve++
-		}
-	}
-	return fmt.Sprintf("%d modules", nMetasploitCve)
-}
-
-// FormatAlertSummary returns a summary of CERT alerts
+// FormatAlertSummary returns a summary of XCERT alerts
 func (r ScanResult) FormatAlertSummary() string {
 	jaCnt := 0
 	enCnt := 0
@@ -417,10 +404,6 @@ func (r ScanResult) FormatAlertSummary() string {
 }

 func (r ScanResult) isDisplayUpdatableNum() bool {
-	if r.Family == config.FreeBSD {
-		return false
-	}
-
 	var mode config.ScanMode
 	s, _ := config.Conf.Servers[r.ServerName]
 	mode = s.Mode
@@ -477,51 +460,3 @@ type Platform struct {
 	Name       string `json:"name"` // aws or azure or gcp or other...
 	InstanceID string `json:"instanceID"`
 }
-
-// RemoveRaspbianPackFromResult is for Raspberry Pi and removes the Raspberry Pi dedicated package from ScanResult.
-func (r ScanResult) RemoveRaspbianPackFromResult() ScanResult {
-	if r.Family != config.Raspbian {
-		return r
-	}
-
-	result := r
-	packs := make(Packages)
-	for _, pack := range r.Packages {
-		if !IsRaspbianPackage(pack.Name, pack.Version) {
-			packs[pack.Name] = pack
-		}
-	}
-	srcPacks := make(SrcPackages)
-	for _, pack := range r.SrcPackages {
-		if !IsRaspbianPackage(pack.Name, pack.Version) {
-			srcPacks[pack.Name] = pack
-
-		}
-	}
-
-	result.Packages = packs
-	result.SrcPackages = srcPacks
-
-	return result
-}
-
-// ClearFields clears a given fields of ScanResult
-func (r ScanResult) ClearFields(targetTagNames []string) ScanResult {
-	if len(targetTagNames) == 0 {
-		return r
-	}
-	target := map[string]bool{}
-	for _, n := range targetTagNames {
-		target[strings.ToLower(n)] = true
-	}
-	t := reflect.ValueOf(r).Type()
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		jsonValue := strings.Split(f.Tag.Get("json"), ",")[0]
-		if ok := target[strings.ToLower(jsonValue)]; ok {
-			vv := reflect.New(f.Type).Elem().Interface()
-			reflect.ValueOf(&r).Elem().FieldByName(f.Name).Set(reflect.ValueOf(vv))
-		}
-	}
-	return r
-}
--- a/models/scanresults_test.go
+++ b/models/scanresults_test.go
@@ -27,7 +27,7 @@ func TestFilterByCvssOver(t *testing.T) {
 							CveID: "CVE-2017-0001",
 							CveContents: NewCveContents(
 								CveContent{
-									Type:         Nvd,
+									Type:         NvdXML,
 									CveID:        "CVE-2017-0001",
 									Cvss2Score:   7.1,
 									LastModified: time.Time{},
@@ -38,7 +38,7 @@ func TestFilterByCvssOver(t *testing.T) {
 							CveID: "CVE-2017-0002",
 							CveContents: NewCveContents(
 								CveContent{
-									Type:         Nvd,
+									Type:         NvdXML,
 									CveID:        "CVE-2017-0002",
 									Cvss2Score:   6.9,
 									LastModified: time.Time{},
@@ -49,7 +49,7 @@ func TestFilterByCvssOver(t *testing.T) {
 							CveID: "CVE-2017-0003",
 							CveContents: NewCveContents(
 								CveContent{
-									Type:         Nvd,
+									Type:         NvdXML,
 									CveID:        "CVE-2017-0003",
 									Cvss2Score:   6.9,
 									LastModified: time.Time{},
@@ -71,7 +71,7 @@ func TestFilterByCvssOver(t *testing.T) {
 						CveID: "CVE-2017-0001",
 						CveContents: NewCveContents(
 							CveContent{
-								Type:         Nvd,
+								Type:         NvdXML,
 								CveID:        "CVE-2017-0001",
 								Cvss2Score:   7.1,
 								LastModified: time.Time{},
@@ -82,7 +82,7 @@ func TestFilterByCvssOver(t *testing.T) {
 						CveID: "CVE-2017-0003",
 						CveContents: NewCveContents(
 							CveContent{
-								Type:         Nvd,
+								Type:         NvdXML,
 								CveID:        "CVE-2017-0003",
 								Cvss2Score:   6.9,
 								LastModified: time.Time{},
@@ -688,7 +688,7 @@ func TestIsDisplayUpdatableNum(t *testing.T) {
 		{
 			mode:     []byte{config.Fast},
 			family:   config.FreeBSD,
-			expected: false,
+			expected: true,
 		},
 		{
 			mode:     []byte{config.Fast},
--- a/models/utils.go
+++ b/models/utils.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package models

 import (
@@ -49,9 +47,9 @@ func ConvertJvnToModel(cveID string, jvn *cvedict.Jvn) *CveContent {
 }

 // ConvertNvdJSONToModel convert NVD to CveContent
-func ConvertNvdJSONToModel(cveID string, nvd *cvedict.NvdJSON) (*CveContent, []Exploit, []Mitigation) {
+func ConvertNvdJSONToModel(cveID string, nvd *cvedict.NvdJSON) *CveContent {
 	if nvd == nil {
-		return nil, nil, nil
+		return nil
 	}
 	// var cpes = []Cpe{}
 	// for _, c := range nvd.Cpes {
@@ -61,29 +59,12 @@ func ConvertNvdJSONToModel(cveID string, nvd *cvedict.NvdJSON) (*CveContent, []E
 	// 	})
 	// }

-	refs := []Reference{}
-	exploits := []Exploit{}
-	mitigations := []Mitigation{}
+	var refs = []Reference{}
 	for _, r := range nvd.References {
 		refs = append(refs, Reference{
 			Link:   r.Link,
 			Source: r.Source,
-			Tags:   strings.Split(r.Tags, ","),
 		})
-		if strings.Contains(r.Tags, "Exploit") {
-			exploits = append(exploits, Exploit{
-				//TODO Add const to here
-				// https://github.com/vulsio/go-exploitdb/blob/master/models/exploit.go#L13-L18
-				ExploitType: "nvd",
-				URL:         r.Link,
-			})
-		}
-		if strings.Contains(r.Tags, "Mitigation") {
-			mitigations = append(mitigations, Mitigation{
-				CveContentType: Nvd,
-				URL:            r.Link,
-			})
-		}
 	}

 	cweIDs := []string{}
@@ -112,5 +93,5 @@ func ConvertNvdJSONToModel(cveID string, nvd *cvedict.NvdJSON) (*CveContent, []E
 		References:   refs,
 		Published:    nvd.PublishedDate,
 		LastModified: nvd.LastModifiedDate,
-	}, exploits, mitigations
+	}
 }
--- a/models/vulninfos.go
+++ b/models/vulninfos.go
@@ -134,7 +134,7 @@ func (ps PackageFixStatuses) Sort() {
 	return
 }

-// PackageFixStatus has name and other status about the package
+// PackageFixStatus has name and other status abount the package
 type PackageFixStatus struct {
 	Name        string `json:"name,omitempty"`
 	NotFixedYet bool   `json:"notFixedYet,omitempty"`
@@ -147,11 +147,9 @@ type VulnInfo struct {
 	CveID                string               `json:"cveID,omitempty"`
 	Confidences          Confidences          `json:"confidences,omitempty"`
 	AffectedPackages     PackageFixStatuses   `json:"affectedPackages,omitempty"`
-	DistroAdvisories     DistroAdvisories     `json:"distroAdvisories,omitempty"` // for Amazon, RHEL, FreeBSD
+	DistroAdvisories     DistroAdvisories     `json:"distroAdvisories,omitempty"` // for Aamazon, RHEL, FreeBSD
 	CveContents          CveContents          `json:"cveContents,omitempty"`
 	Exploits             []Exploit            `json:"exploits,omitempty"`
-	Metasploits          []Metasploit         `json:"metasploits,omitempty"`
-	Mitigations          []Mitigation         `json:"mitigations,omitempty"`
 	AlertDict            AlertDict            `json:"alertDict,omitempty"`
 	CpeURIs              []string             `json:"cpeURIs,omitempty"` // CpeURIs related to this CVE defined in config.toml
 	GitHubSecurityAlerts GitHubSecurityAlerts `json:"gitHubSecurityAlerts,omitempty"`
@@ -161,7 +159,7 @@ type VulnInfo struct {
 	VulnType string `json:"vulnType,omitempty"`
 }

-// Alert has CERT alert information
+// Alert has XCERT alert information
 type Alert struct {
 	URL   string `json:"url,omitempty"`
 	Title string `json:"title,omitempty"`
@@ -234,7 +232,7 @@ func (g WpPackages) Add(pkg WpPackage) WpPackages {
 	return append(g, pkg)
 }

-// Titles returns title (TUI)
+// Titles returns tilte (TUI)
 func (v VulnInfo) Titles(lang, myFamily string) (values []CveContentStr) {
 	if lang == "ja" {
 		if cont, found := v.CveContents[Jvn]; found && 0 < len(cont.Title) {
@@ -247,7 +245,7 @@ func (v VulnInfo) Titles(lang, myFamily string) (values []CveContentStr) {
 		values = append(values, CveContentStr{RedHatAPI, cont.Title})
 	}

-	order := CveContentTypes{Trivy, Nvd, NewCveContentType(myFamily)}
+	order := CveContentTypes{Trivy, Nvd, NvdXML, NewCveContentType(myFamily)}
 	order = append(order, AllCveContetTypes.Except(append(order, Jvn)...)...)
 	for _, ctype := range order {
 		// Only JVN has meaningful title. so return first 100 char of summary
@@ -287,7 +285,7 @@ func (v VulnInfo) Summaries(lang, myFamily string) (values []CveContentStr) {
 		}
 	}

-	order := CveContentTypes{Trivy, NewCveContentType(myFamily), Nvd}
+	order := CveContentTypes{Trivy, NewCveContentType(myFamily), Nvd, NvdXML}
 	order = append(order, AllCveContetTypes.Except(append(order, Jvn)...)...)
 	for _, ctype := range order {
 		if cont, found := v.CveContents[ctype]; found && 0 < len(cont.Summary) {
@@ -323,9 +321,30 @@ func (v VulnInfo) Summaries(lang, myFamily string) (values []CveContentStr) {
 	return
 }

+// Mitigations returns mitigations
+func (v VulnInfo) Mitigations(myFamily string) (values []CveContentStr) {
+	order := CveContentTypes{RedHatAPI}
+	for _, ctype := range order {
+		if cont, found := v.CveContents[ctype]; found && 0 < len(cont.Mitigation) {
+			values = append(values, CveContentStr{
+				Type:  ctype,
+				Value: cont.Mitigation,
+			})
+		}
+	}
+
+	if len(values) == 0 {
+		return []CveContentStr{{
+			Type:  Unknown,
+			Value: "-",
+		}}
+	}
+	return
+}
+
 // Cvss2Scores returns CVSS V2 Scores
 func (v VulnInfo) Cvss2Scores(myFamily string) (values []CveContentCvss) {
-	order := []CveContentType{Nvd, RedHatAPI, RedHat, Jvn}
+	order := []CveContentType{Nvd, NvdXML, RedHatAPI, RedHat, Jvn}
 	if myFamily != config.RedHat && myFamily != config.CentOS {
 		order = append(order, NewCveContentType(myFamily))
 	}
@@ -463,7 +482,7 @@ func (v VulnInfo) MaxCvssScore() CveContentCvss {

 // MaxCvss2Score returns Max CVSS V2 Score
 func (v VulnInfo) MaxCvss2Score() CveContentCvss {
-	order := []CveContentType{Nvd, RedHat, RedHatAPI, Jvn}
+	order := []CveContentType{Nvd, NvdXML, RedHat, RedHatAPI, Jvn}
 	max := 0.0
 	value := CveContentCvss{
 		Type:  Unknown,
@@ -489,7 +508,7 @@ func (v VulnInfo) MaxCvss2Score() CveContentCvss {
 	}

 	// If CVSS score isn't on NVD, RedHat and JVN, use OVAL and advisory Severity.
-	// Convert severity to cvss score roughly, then returns max severity.
+	// Convert severity to cvss srore roughly, then returns max severity.
 	// Only Ubuntu, RedHat and Oracle have severity data in OVAL.
 	order = []CveContentType{Ubuntu, RedHat, Oracle}
 	for _, ctype := range order {
@@ -595,10 +614,10 @@ type CveContentCvss struct {
 type CvssType string

 const (
-	// CVSS2 means CVSS version2
+	// CVSS2 means CVSS vesion2
 	CVSS2 CvssType = "2"

-	// CVSS3 means CVSS version3
+	// CVSS3 means CVSS vesion3
 	CVSS3 CvssType = "3"
 )

@@ -660,6 +679,70 @@ func (v VulnInfo) FormatMaxCvssScore() string {
 		max.Type)
 }

+// Cvss2CalcURL returns CVSS v2 caluclator's URL
+func (v VulnInfo) Cvss2CalcURL() string {
+	return "https://nvd.nist.gov/vuln-metrics/cvss/v2-calculator?name=" + v.CveID
+}
+
+// Cvss3CalcURL returns CVSS v3 caluclator's URL
+func (v VulnInfo) Cvss3CalcURL() string {
+	return "https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator?name=" + v.CveID
+}
+
+// VendorLinks returns links of vendor support's URL
+func (v VulnInfo) VendorLinks(family string) map[string]string {
+	links := map[string]string{}
+	if strings.HasPrefix(v.CveID, "WPVDBID") {
+		links["WPVulnDB"] = fmt.Sprintf("https://wpvulndb.com/vulnerabilities/%s",
+			strings.TrimPrefix(v.CveID, "WPVDBID-"))
+		return links
+	}
+
+	switch family {
+	case config.RedHat, config.CentOS:
+		links["RHEL-CVE"] = "https://access.redhat.com/security/cve/" + v.CveID
+		for _, advisory := range v.DistroAdvisories {
+			aidURL := strings.Replace(advisory.AdvisoryID, ":", "-", -1)
+			links[advisory.AdvisoryID] = fmt.Sprintf("https://rhn.redhat.com/errata/%s.html", aidURL)
+		}
+		return links
+	case config.Oracle:
+		links["Oracle-CVE"] = fmt.Sprintf("https://linux.oracle.com/cve/%s.html", v.CveID)
+		for _, advisory := range v.DistroAdvisories {
+			links[advisory.AdvisoryID] =
+				fmt.Sprintf("https://linux.oracle.com/errata/%s.html", advisory.AdvisoryID)
+		}
+		return links
+	case config.Amazon:
+		links["RHEL-CVE"] = "https://access.redhat.com/security/cve/" + v.CveID
+		for _, advisory := range v.DistroAdvisories {
+			if strings.HasPrefix(advisory.AdvisoryID, "ALAS2") {
+				links[advisory.AdvisoryID] =
+					fmt.Sprintf("https://alas.aws.amazon.com/AL2/%s.html",
+						strings.Replace(advisory.AdvisoryID, "ALAS2", "ALAS", -1))
+			} else {
+				links[advisory.AdvisoryID] =
+					fmt.Sprintf("https://alas.aws.amazon.com/%s.html", advisory.AdvisoryID)
+			}
+		}
+		return links
+	case config.Ubuntu:
+		links["Ubuntu-CVE"] = "http://people.ubuntu.com/~ubuntu-security/cve/" + v.CveID
+		return links
+	case config.Debian:
+		links["Debian-CVE"] = "https://security-tracker.debian.org/tracker/" + v.CveID
+	case config.SUSEEnterpriseServer:
+		links["SUSE-CVE"] = "https://www.suse.com/security/cve/" + v.CveID
+	case config.FreeBSD:
+		for _, advisory := range v.DistroAdvisories {
+			links["FreeBSD-VuXML"] = fmt.Sprintf("https://vuxml.freebsd.org/freebsd/%s.html", advisory.AdvisoryID)
+
+		}
+		return links
+	}
+	return links
+}
+
 // DistroAdvisories is a list of DistroAdvisory
 type DistroAdvisories []DistroAdvisory

@@ -708,22 +791,7 @@ type Exploit struct {
 	BinaryURL    *string                   `json:"binaryURL,omitempty"`
 }

-// Metasploit :
-type Metasploit struct {
-	Name        string   `json:"name"`
-	Title       string   `json:"title"`
-	Description string   `json:"description,omitempty"`
-	URLs        []string `json:",omitempty"`
-}
-
-// Mitigation has a link and content
-type Mitigation struct {
-	CveContentType CveContentType `json:"cveContentType,omitempty"`
-	Mitigation     string         `json:"mitigation,omitempty"`
-	URL            string         `json:"url,omitempty"`
-}
-
-// AlertDict has target cve JPCERT and USCERT alert data
+// AlertDict has target cve's JPCERT and USCERT alert data
 type AlertDict struct {
 	Ja []Alert `json:"ja"`
 	En []Alert `json:"en"`
@@ -744,7 +812,7 @@ func (a AlertDict) FormatSource() string {
 // Confidences is a list of Confidence
 type Confidences []Confidence

-// AppendIfMissing appends confidence to the list if missing
+// AppendIfMissing appends confidence to the list if missiong
 func (cs *Confidences) AppendIfMissing(confidence Confidence) {
 	for _, c := range *cs {
 		if c.DetectionMethod == confidence.DetectionMethod {
@@ -762,7 +830,7 @@ func (cs Confidences) SortByConfident() Confidences {
 	return cs
 }

-// Confidence is a ranking how confident the CVE-ID was detected correctly
+// Confidence is a ranking how confident the CVE-ID was deteted correctly
 // Score: 0 - 100
 type Confidence struct {
 	Score           int             `json:"score"`
@@ -821,36 +889,36 @@ const (
 )

 var (
-	// CpeNameMatch is a ranking how confident the CVE-ID was detected correctly
+	// CpeNameMatch is a ranking how confident the CVE-ID was deteted correctly
 	CpeNameMatch = Confidence{100, CpeNameMatchStr, 1}

-	// YumUpdateSecurityMatch is a ranking how confident the CVE-ID was detected correctly
+	// YumUpdateSecurityMatch is a ranking how confident the CVE-ID was deteted correctly
 	YumUpdateSecurityMatch = Confidence{100, YumUpdateSecurityMatchStr, 2}

-	// PkgAuditMatch is a ranking how confident the CVE-ID was detected correctly
+	// PkgAuditMatch is a ranking how confident the CVE-ID was deteted correctly
 	PkgAuditMatch = Confidence{100, PkgAuditMatchStr, 2}

-	// OvalMatch is a ranking how confident the CVE-ID was detected correctly
+	// OvalMatch is a ranking how confident the CVE-ID was deteted correctly
 	OvalMatch = Confidence{100, OvalMatchStr, 0}

-	// RedHatAPIMatch ranking how confident the CVE-ID was detected correctly
+	// RedHatAPIMatch ranking how confident the CVE-ID was deteted correctly
 	RedHatAPIMatch = Confidence{100, RedHatAPIStr, 0}

-	// DebianSecurityTrackerMatch ranking how confident the CVE-ID was detected correctly
+	// DebianSecurityTrackerMatch ranking how confident the CVE-ID was deteted correctly
 	DebianSecurityTrackerMatch = Confidence{100, DebianSecurityTrackerMatchStr, 0}

-	// TrivyMatch ranking how confident the CVE-ID was detected correctly
+	// TrivyMatch ranking how confident the CVE-ID was deteted correctly
 	TrivyMatch = Confidence{100, TrivyMatchStr, 0}

-	// ChangelogExactMatch is a ranking how confident the CVE-ID was detected correctly
+	// ChangelogExactMatch is a ranking how confident the CVE-ID was deteted correctly
 	ChangelogExactMatch = Confidence{95, ChangelogExactMatchStr, 3}

-	// ChangelogLenientMatch is a ranking how confident the CVE-ID was detected correctly
+	// ChangelogLenientMatch is a ranking how confident the CVE-ID was deteted correctly
 	ChangelogLenientMatch = Confidence{50, ChangelogLenientMatchStr, 4}

-	// GitHubMatch is a ranking how confident the CVE-ID was detected correctly
+	// GitHubMatch is a ranking how confident the CVE-ID was deteted correctly
 	GitHubMatch = Confidence{97, GitHubMatchStr, 2}

-	// WPVulnDBMatch is a ranking how confident the CVE-ID was detected correctly
+	// WPVulnDBMatch is a ranking how confident the CVE-ID was deteted correctly
 	WPVulnDBMatch = Confidence{100, WPVulnDBMatchStr, 0}
 )
--- a/models/vulninfos_test.go
+++ b/models/vulninfos_test.go
@@ -28,10 +28,10 @@ func TestTitles(t *testing.T) {
 							Type:    RedHat,
 							Summary: "Summary RedHat",
 						},
-						Nvd: {
-							Type:    Nvd,
+						NvdXML: {
+							Type:    NvdXML,
 							Summary: "Summary NVD",
-							// Severity is NOT included in NVD
+							// Severity is NIOT included in NVD
 						},
 					},
 				},
@@ -42,7 +42,7 @@ func TestTitles(t *testing.T) {
 					Value: "Title1",
 				},
 				{
-					Type:  Nvd,
+					Type:  NvdXML,
 					Value: "Summary NVD",
 				},
 				{
@@ -65,17 +65,17 @@ func TestTitles(t *testing.T) {
 							Type:    RedHat,
 							Summary: "Summary RedHat",
 						},
-						Nvd: {
-							Type:    Nvd,
+						NvdXML: {
+							Type:    NvdXML,
 							Summary: "Summary NVD",
-							// Severity is NOT included in NVD
+							// Severity is NIOT included in NVD
 						},
 					},
 				},
 			},
 			out: []CveContentStr{
 				{
-					Type:  Nvd,
+					Type:  NvdXML,
 					Value: "Summary NVD",
 				},
 				{
@@ -130,10 +130,10 @@ func TestSummaries(t *testing.T) {
 							Type:    RedHat,
 							Summary: "Summary RedHat",
 						},
-						Nvd: {
-							Type:    Nvd,
+						NvdXML: {
+							Type:    NvdXML,
 							Summary: "Summary NVD",
-							// Severity is NOT included in NVD
+							// Severity is NIOT included in NVD
 						},
 					},
 				},
@@ -148,7 +148,7 @@ func TestSummaries(t *testing.T) {
 					Value: "Summary RedHat",
 				},
 				{
-					Type:  Nvd,
+					Type:  NvdXML,
 					Value: "Summary NVD",
 				},
 			},
@@ -168,10 +168,10 @@ func TestSummaries(t *testing.T) {
 							Type:    RedHat,
 							Summary: "Summary RedHat",
 						},
-						Nvd: {
-							Type:    Nvd,
+						NvdXML: {
+							Type:    NvdXML,
 							Summary: "Summary NVD",
-							// Severity is NOT included in NVD
+							// Severity is NIOT included in NVD
 						},
 					},
 				},
@@ -182,7 +182,7 @@ func TestSummaries(t *testing.T) {
 					Value: "Summary RedHat",
 				},
 				{
-					Type:  Nvd,
+					Type:  NvdXML,
 					Value: "Summary NVD",
 				},
 			},
@@ -219,8 +219,8 @@ func TestCountGroupBySeverity(t *testing.T) {
 				"CVE-2017-0002": {
 					CveID: "CVE-2017-0002",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 6.0,
 						},
 						RedHat: {
@@ -232,8 +232,8 @@ func TestCountGroupBySeverity(t *testing.T) {
 				"CVE-2017-0003": {
 					CveID: "CVE-2017-0003",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 2.0,
 						},
 					},
@@ -241,8 +241,8 @@ func TestCountGroupBySeverity(t *testing.T) {
 				"CVE-2017-0004": {
 					CveID: "CVE-2017-0004",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 5.0,
 						},
 					},
@@ -280,8 +280,8 @@ func TestToSortedSlice(t *testing.T) {
 				"CVE-2017-0002": {
 					CveID: "CVE-2017-0002",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 6.0,
 						},
 						RedHat: {
@@ -293,8 +293,8 @@ func TestToSortedSlice(t *testing.T) {
 				"CVE-2017-0001": {
 					CveID: "CVE-2017-0001",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 7.0,
 						},
 						RedHat: {
@@ -308,8 +308,8 @@ func TestToSortedSlice(t *testing.T) {
 				{
 					CveID: "CVE-2017-0001",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 7.0,
 						},
 						RedHat: {
@@ -321,8 +321,8 @@ func TestToSortedSlice(t *testing.T) {
 				{
 					CveID: "CVE-2017-0002",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 6.0,
 						},
 						RedHat: {
@@ -339,8 +339,8 @@ func TestToSortedSlice(t *testing.T) {
 				"CVE-2017-0002": {
 					CveID: "CVE-2017-0002",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 6.0,
 						},
 						RedHat: {
@@ -372,8 +372,8 @@ func TestToSortedSlice(t *testing.T) {
 				{
 					CveID: "CVE-2017-0002",
 					CveContents: CveContents{
-						Nvd: {
-							Type:       Nvd,
+						NvdXML: {
+							Type:       NvdXML,
 							Cvss2Score: 6.0,
 						},
 						RedHat: {
@@ -456,8 +456,8 @@ func TestCvss2Scores(t *testing.T) {
 						Cvss2Score:    8.0,
 						Cvss2Vector:   "AV:N/AC:L/Au:N/C:N/I:N/A:P",
 					},
-					Nvd: {
-						Type:          Nvd,
+					NvdXML: {
+						Type:          NvdXML,
 						Cvss2Score:    8.1,
 						Cvss2Vector:   "AV:N/AC:L/Au:N/C:N/I:N/A:P",
 						Cvss2Severity: "HIGH",
@@ -466,7 +466,7 @@ func TestCvss2Scores(t *testing.T) {
 			},
 			out: []CveContentCvss{
 				{
-					Type: Nvd,
+					Type: NvdXML,
 					Value: Cvss{
 						Type:     CVSS2,
 						Score:    8.1,
@@ -528,11 +528,11 @@ func TestMaxCvss2Scores(t *testing.T) {
 						Cvss2Score:    8.0,
 						Cvss2Vector:   "AV:N/AC:L/Au:N/C:N/I:N/A:P",
 					},
-					Nvd: {
-						Type:        Nvd,
+					NvdXML: {
+						Type:        NvdXML,
 						Cvss2Score:  8.1,
 						Cvss2Vector: "AV:N/AC:L/Au:N/C:N/I:N/A:P",
-						// Severity is NOT included in NVD
+						// Severity is NIOT included in NVD
 					},
 				},
 			},
@@ -602,8 +602,8 @@ func TestCvss3Scores(t *testing.T) {
 						Cvss3Score:    8.0,
 						Cvss3Vector:   "AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:L",
 					},
-					Nvd: {
-						Type:          Nvd,
+					NvdXML: {
+						Type:          NvdXML,
 						Cvss2Score:    8.1,
 						Cvss2Vector:   "AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:L",
 						Cvss2Severity: "HIGH",
@@ -611,13 +611,6 @@ func TestCvss3Scores(t *testing.T) {
 				},
 			},
 			out: []CveContentCvss{
-				{
-					Type: Nvd,
-					Value: Cvss{
-						Type:  CVSS3,
-						Score: 0.0,
-					},
-				},
 				{
 					Type: RedHat,
 					Value: Cvss{
@@ -699,8 +692,8 @@ func TestMaxCvssScores(t *testing.T) {
 		{
 			in: VulnInfo{
 				CveContents: CveContents{
-					Nvd: {
-						Type:       Nvd,
+					NvdXML: {
+						Type:       NvdXML,
 						Cvss3Score: 7.0,
 					},
 					RedHat: {
@@ -762,15 +755,15 @@ func TestMaxCvssScores(t *testing.T) {
 						Type:          Ubuntu,
 						Cvss2Severity: "MEDIUM",
 					},
-					Nvd: {
-						Type:          Nvd,
+					NvdXML: {
+						Type:          NvdXML,
 						Cvss2Score:    7.0,
 						Cvss2Severity: "HIGH",
 					},
 				},
 			},
 			out: CveContentCvss{
-				Type: Nvd,
+				Type: NvdXML,
 				Value: Cvss{
 					Type:     CVSS2,
 					Score:    7.0,
@@ -805,8 +798,8 @@ func TestMaxCvssScores(t *testing.T) {
 						Type:          Ubuntu,
 						Cvss2Severity: "MEDIUM",
 					},
-					Nvd: {
-						Type:          Nvd,
+					NvdXML: {
+						Type:          NvdXML,
 						Cvss2Score:    4.0,
 						Cvss2Severity: "MEDIUM",
 					},
@@ -818,7 +811,7 @@ func TestMaxCvssScores(t *testing.T) {
 				},
 			},
 			out: CveContentCvss{
-				Type: Nvd,
+				Type: NvdXML,
 				Value: Cvss{
 					Type:     CVSS2,
 					Score:    4,
@@ -864,10 +857,10 @@ func TestFormatMaxCvssScore(t *testing.T) {
 						Cvss2Severity: "HIGH",
 						Cvss3Score:    8.0,
 					},
-					Nvd: {
-						Type:       Nvd,
+					NvdXML: {
+						Type:       NvdXML,
 						Cvss2Score: 8.1,
-						// Severity is NOT included in NVD
+						// Severity is NIOT included in NVD
 					},
 				},
 			},
@@ -888,8 +881,8 @@ func TestFormatMaxCvssScore(t *testing.T) {
 						Cvss3Severity: "HIGH",
 						Cvss3Score:    9.9,
 					},
-					Nvd: {
-						Type:       Nvd,
+					NvdXML: {
+						Type:       NvdXML,
 						Cvss2Score: 8.1,
 					},
 				},
@@ -929,7 +922,7 @@ func TestSortPackageStatues(t *testing.T) {
 	}
 }

-func TestStorePackageStatuses(t *testing.T) {
+func TestStorePackageStatueses(t *testing.T) {
 	var tests = []struct {
 		pkgstats PackageFixStatuses
 		in       PackageFixStatus
@@ -992,7 +985,7 @@ func TestAppendIfMissing(t *testing.T) {
 	}
 }

-func TestSortByConfident(t *testing.T) {
+func TestSortByConfiden(t *testing.T) {
 	var tests = []struct {
 		in  Confidences
 		out Confidences
--- a/msf/empty.go
+++ b/msf/empty.go
@@ -1 +0,0 @@
-package msf
--- a/msf/msf.go
+++ b/msf/msf.go
@@ -1,75 +0,0 @@
-// +build !scanner
-
-package msf
-
-import (
-	"fmt"
-	"net/http"
-
-	cnf "github.com/future-architect/vuls/config"
-	"github.com/future-architect/vuls/models"
-	"github.com/parnurzeal/gorequest"
-	"github.com/takuzoo3868/go-msfdb/db"
-	metasploitmodels "github.com/takuzoo3868/go-msfdb/models"
-	"golang.org/x/xerrors"
-)
-
-// FillWithMetasploit fills metasploit module information that has in module
-func FillWithMetasploit(driver db.DB, r *models.ScanResult) (nMetasploitCve int, err error) {
-	if driver == nil {
-		return 0, nil
-	}
-	for cveID, vuln := range r.ScannedCves {
-		if cveID == "" {
-			continue
-		}
-		ms := driver.GetModuleByCveID(cveID)
-		if len(ms) == 0 {
-			continue
-		}
-		modules := ConvertToModels(ms)
-		vuln.Metasploits = modules
-		r.ScannedCves[cveID] = vuln
-		nMetasploitCve++
-	}
-
-	return nMetasploitCve, nil
-}
-
-// ConvertToModels converts gost model to vuls model
-func ConvertToModels(ms []*metasploitmodels.Metasploit) (modules []models.Metasploit) {
-	for _, m := range ms {
-		var links []string
-		if 0 < len(m.References) {
-			for _, u := range m.References {
-				links = append(links, u.Link)
-			}
-		}
-		module := models.Metasploit{
-			Name:        m.Name,
-			Title:       m.Title,
-			Description: m.Description,
-			URLs:        links,
-		}
-		modules = append(modules, module)
-	}
-	return modules
-}
-
-// CheckHTTPHealth do health check
-func CheckHTTPHealth() error {
-	if !cnf.Conf.Metasploit.IsFetchViaHTTP() {
-		return nil
-	}
-
-	url := fmt.Sprintf("%s/health", cnf.Conf.Metasploit.URL)
-	var errs []error
-	var resp *http.Response
-	resp, _, errs = gorequest.New().Get(url).End()
-	//  resp, _, errs = gorequest.New().SetDebug(config.Conf.Debug).Get(url).End()
-	//  resp, _, errs = gorequest.New().Proxy(api.httpProxy).Get(url).End()
-	if 0 < len(errs) || resp == nil || resp.StatusCode != 200 {
-		return xerrors.Errorf("Failed to connect to metasploit server. url: %s, errs: %w", url, errs)
-	}
-	return nil
-}
--- a/oval/alpine.go
+++ b/oval/alpine.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
--- a/oval/debian.go
+++ b/oval/debian.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
@@ -40,13 +38,7 @@ func (o DebianBase) update(r *models.ScanResult, defPacks defPacks) {
 				defPacks.def.Debian.CveID)
 			cveContents = models.CveContents{}
 		}
-		if r.Family != config.Raspbian {
-			vinfo.Confidences.AppendIfMissing(models.OvalMatch)
-		} else {
-			if len(vinfo.Confidences) == 0 {
-				vinfo.Confidences.AppendIfMissing(models.OvalMatch)
-			}
-		}
+		vinfo.Confidences.AppendIfMissing(models.OvalMatch)
 		cveContents[ctype] = ovalContent
 		vinfo.CveContents = cveContents
 	}
@@ -61,7 +53,7 @@ func (o DebianBase) update(r *models.ScanResult, defPacks defPacks) {
 	}

 	// Update package status of source packages.
-	// In the case of Debian based Linux, sometimes source package name is defined as affected package in OVAL.
+	// In the case of Debian based Linux, sometimes source package name is difined as affected package in OVAL.
 	// To display binary package name showed in apt-get, need to convert source name to binary name.
 	for binName := range defPacks.binpkgFixstat {
 		if srcPack, ok := r.SrcPackages.FindByBinName(binName); ok {
@@ -140,28 +132,12 @@ func (o Debian) FillWithOval(driver db.DB, r *models.ScanResult) (nCVEs int, err

 	var relatedDefs ovalResult
 	if config.Conf.OvalDict.IsFetchViaHTTP() {
-		if r.Family != config.Raspbian {
-			if relatedDefs, err = getDefsByPackNameViaHTTP(r); err != nil {
-				return 0, err
-			}
-		} else {
-			// OVAL does not support Package for Raspbian, so skip it.
-			result := r.RemoveRaspbianPackFromResult()
-			if relatedDefs, err = getDefsByPackNameViaHTTP(&result); err != nil {
-				return 0, err
-			}
+		if relatedDefs, err = getDefsByPackNameViaHTTP(r); err != nil {
+			return 0, err
 		}
 	} else {
-		if r.Family != config.Raspbian {
-			if relatedDefs, err = getDefsByPackNameFromOvalDB(driver, r); err != nil {
-				return 0, err
-			}
-		} else {
-			// OVAL does not support Package for Raspbian, so skip it.
-			result := r.RemoveRaspbianPackFromResult()
-			if relatedDefs, err = getDefsByPackNameFromOvalDB(driver, &result); err != nil {
-				return 0, err
-			}
+		if relatedDefs, err = getDefsByPackNameFromOvalDB(driver, r); err != nil {
+			return 0, err
 		}
 	}

@@ -361,7 +337,7 @@ func (o Ubuntu) fillWithOval(driver db.DB, r *models.ScanResult, kernelNamesInOv
 		if v, ok := r.Packages[linuxImage]; ok {
 			runningKernelVersion = v.Version
 		} else {
-			util.Log.Warnf("Unable to detect vulns of running kernel because the version of the running kernel is unknown. server: %s",
+			util.Log.Warnf("Unable to detect vulns of running kernel because the version of the runnning kernel is unknown. server: %s",
 				r.ServerName)
 		}

@@ -389,13 +365,13 @@ func (o Ubuntu) fillWithOval(driver db.DB, r *models.ScanResult, kernelNamesInOv
 		}
 		for srcPackName, srcPack := range r.SrcPackages {
 			copiedSourcePkgs[srcPackName] = srcPack
-			targetBinaryNames := []string{}
+			targetBianryNames := []string{}
 			for _, n := range srcPack.BinaryNames {
 				if n == kernelPkgInOVAL || !strings.HasPrefix(n, "linux-") {
-					targetBinaryNames = append(targetBinaryNames, n)
+					targetBianryNames = append(targetBianryNames, n)
 				}
 			}
-			srcPack.BinaryNames = targetBinaryNames
+			srcPack.BinaryNames = targetBianryNames
 			r.SrcPackages[srcPackName] = srcPack
 		}

--- a/oval/debian_test.go
+++ b/oval/debian_test.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
--- a/oval/empty.go
+++ b/oval/empty.go
@@ -1 +0,0 @@
-package oval
--- a/oval/oval.go
+++ b/oval/oval.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
@@ -67,7 +65,7 @@ func (b Base) CheckIfOvalFetched(driver db.DB, osFamily, release string) (fetche
 	}
 	count := 0
 	if err := json.Unmarshal([]byte(body), &count); err != nil {
-		return false, xerrors.Errorf("Failed to Unmarshal. body: %s, err: %w", body, err)
+		return false, xerrors.Errorf("Failed to Unmarshall. body: %s, err: %w", body, err)
 	}
 	return 0 < count, nil
 }
@@ -85,7 +83,7 @@ func (b Base) CheckIfOvalFresh(driver db.DB, osFamily, release string) (ok bool,
 		}

 		if err := json.Unmarshal([]byte(body), &lastModified); err != nil {
-			return false, xerrors.Errorf("Failed to Unmarshal. body: %s, err: %w", body, err)
+			return false, xerrors.Errorf("Failed to Unmarshall. body: %s, err: %w", body, err)
 		}
 	}

--- a/oval/redhat.go
+++ b/oval/redhat.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
@@ -102,7 +100,7 @@ func (o RedHatBase) update(r *models.ScanResult, defPacks defPacks) (nCVEs int)
 			cveContents := vinfo.CveContents
 			if v, ok := vinfo.CveContents[ctype]; ok {
 				if v.LastModified.After(ovalContent.LastModified) {
-					util.Log.Debugf("%s, OvalID: %d ignored: ",
+					util.Log.Debugf("%s, OvalID: %d ignroed: ",
 						cve.CveID, defPacks.def.ID)
 				} else {
 					util.Log.Debugf("%s OVAL will be overwritten", cve.CveID)
--- a/oval/redhat_test.go
+++ b/oval/redhat_test.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
--- a/oval/suse.go
+++ b/oval/suse.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
--- a/oval/util.go
+++ b/oval/util.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
@@ -214,7 +212,7 @@ func httpGet(url string, req request, resChan chan<- response, errChan chan<- er

 	defs := []ovalmodels.Definition{}
 	if err := json.Unmarshal([]byte(body), &defs); err != nil {
-		errChan <- xerrors.Errorf("Failed to Unmarshal. body: %s, err: %w", body, err)
+		errChan <- xerrors.Errorf("Failed to Unmarshall. body: %s, err: %w", body, err)
 		return
 	}
 	resChan <- response{
@@ -278,9 +276,6 @@ func getDefsByPackNameFromOvalDB(driver db.DB, r *models.ScanResult) (relatedDef
 }

 func major(version string) string {
-	if version == "" {
-		return ""
-	}
 	ss := strings.SplitN(version, ":", 2)
 	ver := ""
 	if len(ss) == 1 {
@@ -332,14 +327,13 @@ func isOvalDefAffected(def ovalmodels.Definition, req request, family string, ru
 				config.Amazon,
 				config.SUSEEnterpriseServer,
 				config.Debian,
-				config.Ubuntu,
-				config.Raspbian:
+				config.Ubuntu:
 				// Use fixed state in OVAL for these distros.
 				return true, false, ovalPack.Version
 			}

 			// But CentOS can't judge whether fixed or unfixed.
-			// Because fixed state in RHEL OVAL is different.
+			// Because fixed state in RHEL's OVAL is different.
 			// So, it have to be judged version comparison.

 			// `offline` or `fast` scan mode can't get a updatable version.
@@ -368,8 +362,7 @@ var esVerPattern = regexp.MustCompile(`\.el(\d+)(?:_\d+)?`)
 func lessThan(family, newVer string, packInOVAL ovalmodels.Package) (bool, error) {
 	switch family {
 	case config.Debian,
-		config.Ubuntu,
-		config.Raspbian:
+		config.Ubuntu:
 		vera, err := debver.NewVersion(newVer)
 		if err != nil {
 			return false, err
--- a/oval/util_test.go
+++ b/oval/util_test.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package oval

 import (
@@ -18,7 +16,7 @@ func TestUpsert(t *testing.T) {
 		def      ovalmodels.Definition
 		packName string
 		fixStat  fixStat
-		upsert   bool
+		upserted bool
 		out      ovalResult
 	}{
 		//insert
@@ -32,7 +30,7 @@ func TestUpsert(t *testing.T) {
 				notFixedYet: true,
 				fixedIn:     "1.0.0",
 			},
-			upsert: false,
+			upserted: false,
 			out: ovalResult{
 				[]defPacks{
 					{
@@ -85,7 +83,7 @@ func TestUpsert(t *testing.T) {
 				notFixedYet: false,
 				fixedIn:     "3.0.0",
 			},
-			upsert: true,
+			upserted: true,
 			out: ovalResult{
 				[]defPacks{
 					{
@@ -119,9 +117,9 @@ func TestUpsert(t *testing.T) {
 		},
 	}
 	for i, tt := range tests {
-		upsert := tt.res.upsert(tt.def, tt.packName, tt.fixStat)
-		if tt.upsert != upsert {
-			t.Errorf("[%d]\nexpected: %t\n  actual: %t\n", i, tt.upsert, upsert)
+		upserted := tt.res.upsert(tt.def, tt.packName, tt.fixStat)
+		if tt.upserted != upserted {
+			t.Errorf("[%d]\nexpected: %t\n  actual: %t\n", i, tt.upserted, upserted)
 		}
 		if !reflect.DeepEqual(tt.out, tt.res) {
 			t.Errorf("[%d]\nexpected: %v\n  actual: %v\n", i, tt.out, tt.res)
@@ -1091,15 +1089,11 @@ func TestIsOvalDefAffected(t *testing.T) {
 	}
 }

-func Test_major(t *testing.T) {
+func TestMajor(t *testing.T) {
 	var tests = []struct {
 		in       string
 		expected string
 	}{
-		{
-			in:       "",
-			expected: "",
-		},
 		{
 			in:       "4.1",
 			expected: "4",
--- a/report/cve_client.go
+++ b/report/cve_client.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package report

 import (
--- a/report/db_client.go
+++ b/report/db_client.go
@@ -1,5 +1,3 @@
-// +build !scanner
-
 package report

 import (
@@ -11,27 +9,24 @@ import (
 	cvedb "github.com/kotakanbe/go-cve-dictionary/db"
 	ovaldb "github.com/kotakanbe/goval-dictionary/db"
 	exploitdb "github.com/mozqnet/go-exploitdb/db"
-	metasploitdb "github.com/takuzoo3868/go-msfdb/db"
 	"golang.org/x/xerrors"
 )

-// DBClient is DB client for reporting
+// DBClient is a dictionarie's db client for reporting
 type DBClient struct {
-	CveDB        cvedb.DB
-	OvalDB       ovaldb.DB
-	GostDB       gostdb.DB
-	ExploitDB    exploitdb.DB
-	MetasploitDB metasploitdb.DB
+	CveDB     cvedb.DB
+	OvalDB    ovaldb.DB
+	GostDB    gostdb.DB
+	ExploitDB exploitdb.DB
 }

 // DBClientConf has a configuration of Vulnerability DBs
 type DBClientConf struct {
-	CveDictCnf    config.GoCveDictConf
-	OvalDictCnf   config.GovalDictConf
-	GostCnf       config.GostConf
-	ExploitCnf    config.ExploitConf
-	MetasploitCnf config.MetasploitConf
-	DebugSQL      bool
+	CveDictCnf  config.GoCveDictConf
+	OvalDictCnf config.GovalDictConf
+	GostCnf     config.GostConf
+	ExploitCnf  config.ExploitConf
+	DebugSQL    bool
 }

 // NewDBClient returns db clients
@@ -71,21 +66,11 @@ func NewDBClient(cnf DBClientConf) (dbclient *DBClient, locked bool, err error)
 			cnf.ExploitCnf.SQLite3Path, err)
 	}

-	metasploitdb, locked, err := NewMetasploitDB(cnf)
-	if locked {
-		return nil, true, xerrors.Errorf("metasploitDB is locked: %s",
-			cnf.MetasploitCnf.SQLite3Path)
-	} else if err != nil {
-		util.Log.Warnf("Unable to use metasploitDB: %s, err: %s",
-			cnf.MetasploitCnf.SQLite3Path, err)
-	}
-
 	return &DBClient{
-		CveDB:        cveDriver,
-		OvalDB:       ovaldb,
-		GostDB:       gostdb,
-		ExploitDB:    exploitdb,
-		MetasploitDB: metasploitdb,
+		CveDB:     cveDriver,
+		OvalDB:    ovaldb,
+		GostDB:    gostdb,
+		ExploitDB: exploitdb,
 	}, false, nil
 }

@@ -192,32 +177,6 @@ func NewExploitDB(cnf DBClientConf) (driver exploitdb.DB, locked bool, err error
 	return driver, false, nil
 }

-// NewMetasploitDB returns db client for Metasploit
-func NewMetasploitDB(cnf DBClientConf) (driver metasploitdb.DB, locked bool, err error) {
-	if config.Conf.Metasploit.IsFetchViaHTTP() {
-		return nil, false, nil
-	}
-	path := cnf.MetasploitCnf.URL
-	if cnf.MetasploitCnf.Type == "sqlite3" {
-		path = cnf.MetasploitCnf.SQLite3Path
-
-		if _, err := os.Stat(path); os.IsNotExist(err) {
-			util.Log.Warnf("--msfdb-path=%s file not found. Fetch go-msfdb before reporting if you want to display metasploit modules of detected CVE-IDs. For details, see `https://github.com/takuzoo3868/go-msfdb`", path)
-			return nil, false, nil
-		}
-	}
-
-	util.Log.Debugf("Open metasploit db (%s): %s", cnf.MetasploitCnf.Type, path)
-	if driver, locked, err = metasploitdb.NewDB(cnf.MetasploitCnf.Type, path, cnf.DebugSQL, false); err != nil {
-		if locked {
-			util.Log.Errorf("metasploitDB is locked. err: %+v", err)
-			return nil, true, err
-		}
-		return nil, false, err
-	}
-	return driver, false, nil
-}
-
 // CloseDB close dbs
 func (d DBClient) CloseDB() {
 	if d.CveDB != nil {
--- a/report/email.go
+++ b/report/email.go
@@ -1,15 +1,13 @@
 package report

 import (
-	"crypto/tls"
 	"fmt"
 	"net"
 	"net/mail"
+	"net/smtp"
 	"strings"
 	"time"

-	sasl "github.com/emersion/go-sasl"
-	smtp "github.com/emersion/go-smtp"
 	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/models"
 	"golang.org/x/xerrors"
@@ -22,6 +20,7 @@ func (w EMailWriter) Write(rs ...models.ScanResult) (err error) {
 	conf := config.Conf
 	var message string
 	sender := NewEMailSender()
+
 	m := map[string]int{}
 	for _, r := range rs {
 		if conf.FormatOneEMail {
@@ -85,75 +84,7 @@ type EMailSender interface {

 type emailSender struct {
 	conf config.SMTPConf
-}
-
-func (e *emailSender) sendMail(smtpServerAddr, message string) (err error) {
-	var c *smtp.Client
-	var auth sasl.Client
-	emailConf := e.conf
-	//TLS Config
-	tlsConfig := &tls.Config{
-		ServerName: emailConf.SMTPAddr,
-	}
-	switch emailConf.SMTPPort {
-	case "465":
-		//New TLS connection
-		c, err = smtp.DialTLS(smtpServerAddr, tlsConfig)
-		if err != nil {
-			return xerrors.Errorf("Failed to create TLS connection to SMTP server: %w", err)
-		}
-	default:
-		c, err = smtp.Dial(smtpServerAddr)
-		if err != nil {
-			return xerrors.Errorf("Failed to create connection to SMTP server: %w", err)
-		}
-	}
-	defer c.Close()
-
-	if err = c.Hello("localhost"); err != nil {
-		return xerrors.Errorf("Failed to send Hello command: %w", err)
-	}
-
-	if ok, _ := c.Extension("STARTTLS"); ok {
-		if err := c.StartTLS(tlsConfig); err != nil {
-			return xerrors.Errorf("Failed to STARTTLS: %w", err)
-		}
-	}
-
-	if ok, param := c.Extension("AUTH"); ok {
-		authList := strings.Split(param, " ")
-		auth = e.newSaslClient(authList)
-	}
-
-	if err = c.Auth(auth); err != nil {
-		return xerrors.Errorf("Failed to authenticate: %w", err)
-	}
-	if err = c.Mail(emailConf.From, nil); err != nil {
-		return xerrors.Errorf("Failed to send Mail command: %w", err)
-	}
-	for _, to := range emailConf.To {
-		if err = c.Rcpt(to); err != nil {
-			return xerrors.Errorf("Failed to send Rcpt command: %w", err)
-		}
-	}
-
-	w, err := c.Data()
-	if err != nil {
-		return xerrors.Errorf("Failed to send Data command: %w", err)
-	}
-	_, err = w.Write([]byte(message))
-	if err != nil {
-		return xerrors.Errorf("Failed to write EMail message: %w", err)
-	}
-	err = w.Close()
-	if err != nil {
-		return xerrors.Errorf("Failed to close Writer: %w", err)
-	}
-	err = c.Quit()
-	if err != nil {
-		return xerrors.Errorf("Failed to close connection: %w", err)
-	}
-	return nil
+	send func(string, smtp.Auth, string, []string, []byte) error
 }

 func (e *emailSender) Send(subject, body string) (err error) {
@@ -182,13 +113,30 @@ func (e *emailSender) Send(subject, body string) (err error) {
 	smtpServer := net.JoinHostPort(emailConf.SMTPAddr, emailConf.SMTPPort)

 	if emailConf.User != "" && emailConf.Password != "" {
-		err = e.sendMail(smtpServer, message)
+		err = e.send(
+			smtpServer,
+			smtp.PlainAuth(
+				"",
+				emailConf.User,
+				emailConf.Password,
+				emailConf.SMTPAddr,
+			),
+			emailConf.From,
+			mailAddresses,
+			[]byte(message),
+		)
 		if err != nil {
 			return xerrors.Errorf("Failed to send emails: %w", err)
 		}
 		return nil
 	}
-	err = e.sendMail(smtpServer, message)
+	err = e.send(
+		smtpServer,
+		nil,
+		emailConf.From,
+		mailAddresses,
+		[]byte(message),
+	)
 	if err != nil {
 		return xerrors.Errorf("Failed to send emails: %w", err)
 	}
@@ -197,19 +145,5 @@ func (e *emailSender) Send(subject, body string) (err error) {

 // NewEMailSender creates emailSender
 func NewEMailSender() EMailSender {
-	return &emailSender{config.Conf.EMail}
-}
-
-func (e *emailSender) newSaslClient(authList []string) sasl.Client {
-	for _, v := range authList {
-		switch v {
-		case "PLAIN":
-			auth := sasl.NewPlainClient("", e.conf.User, e.conf.Password)
-			return auth
-		case "LOGIN":
-			auth := sasl.NewLoginClient(e.conf.User, e.conf.Password)
-			return auth
-		}
-	}
-	return nil
+	return &emailSender{config.Conf.EMail, smtp.SendMail}
 }
--- a/report/email_test.go
+++ b/report/email_test.go
@@ -0,0 +1,115 @@
+package report
+
+import (
+	"net/smtp"
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/future-architect/vuls/config"
+)
+
+type emailRecorder struct {
+	addr string
+	auth smtp.Auth
+	from string
+	to   []string
+	body string
+}
+
+type mailTest struct {
+	in  config.SMTPConf
+	out emailRecorder
+}
+
+var mailTests = []mailTest{
+	{
+		config.SMTPConf{
+			SMTPAddr: "127.0.0.1",
+			SMTPPort: "25",
+
+			From: "from@address.com",
+			To:   []string{"to@address.com"},
+			Cc:   []string{"cc@address.com"},
+		},
+		emailRecorder{
+			addr: "127.0.0.1:25",
+			auth: smtp.PlainAuth("", "", "", "127.0.0.1"),
+			from: "from@address.com",
+			to:   []string{"to@address.com", "cc@address.com"},
+			body: "body",
+		},
+	},
+	{
+		config.SMTPConf{
+			SMTPAddr: "127.0.0.1",
+			SMTPPort: "25",
+
+			User:     "vuls",
+			Password: "password",
+
+			From: "from@address.com",
+			To:   []string{"to1@address.com", "to2@address.com"},
+			Cc:   []string{"cc1@address.com", "cc2@address.com"},
+		},
+		emailRecorder{
+			addr: "127.0.0.1:25",
+			auth: smtp.PlainAuth(
+				"",
+				"vuls",
+				"password",
+				"127.0.0.1",
+			),
+			from: "from@address.com",
+			to: []string{"to1@address.com", "to2@address.com",
+				"cc1@address.com", "cc2@address.com"},
+			body: "body",
+		},
+	},
+}
+
+func TestSend(t *testing.T) {
+	for i, test := range mailTests {
+		f, r := mockSend(nil)
+		sender := &emailSender{conf: test.in, send: f}
+
+		subject := "subject"
+		body := "body"
+		if err := sender.Send(subject, body); err != nil {
+			t.Errorf("unexpected error: %s", err)
+		}
+
+		if r.addr != test.out.addr {
+			t.Errorf("#%d: wrong 'addr' field.\r\nexpected: %s\n got: %s", i, test.out.addr, r.addr)
+		}
+
+		if !reflect.DeepEqual(r.auth, test.out.auth) && r.auth != nil {
+			t.Errorf("#%d: wrong 'auth' field.\r\nexpected: %v\n got: %v", i, test.out.auth, r.auth)
+		}
+
+		if r.from != test.out.from {
+			t.Errorf("#%d: wrong 'from' field.\r\nexpected: %v\n got: %v", i, test.out.from, r.from)
+		}
+
+		if !reflect.DeepEqual(r.to, test.out.to) {
+			t.Errorf("#%d: wrong 'to' field.\r\nexpected: %v\n got: %v", i, test.out.to, r.to)
+		}
+
+		if r.body != test.out.body {
+			t.Errorf("#%d: wrong 'body' field.\r\nexpected: %v\n got: %v", i, test.out.body, r.body)
+		}
+
+	}
+
+}
+
+func mockSend(errToReturn error) (func(string, smtp.Auth, string, []string, []byte) error, *emailRecorder) {
+	r := new(emailRecorder)
+	return func(addr string, a smtp.Auth, from string, to []string, msg []byte) error {
+		// Split into header and body
+		messages := strings.Split(string(msg), "\r\n\r\n")
+		body := messages[1]
+		*r = emailRecorder{addr, a, from, to, body}
+		return errToReturn
+	}, r
+}
--- a/report/hipchat.go
+++ b/report/hipchat.go
@@ -0,0 +1,74 @@
+package report
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/models"
+)
+
+// HipChatWriter send report to HipChat
+type HipChatWriter struct{}
+
+func (w HipChatWriter) Write(rs ...models.ScanResult) (err error) {
+	conf := config.Conf.HipChat
+
+	for _, r := range rs {
+		serverInfo := fmt.Sprintf("%s", r.ServerInfo())
+		if err = postMessage(conf.Room, conf.AuthToken, serverInfo); err != nil {
+			return err
+		}
+
+		for _, vinfo := range r.ScannedCves {
+			maxCvss := vinfo.MaxCvssScore()
+			severity := strings.ToUpper(maxCvss.Value.Severity)
+			if severity == "" {
+				severity = "?"
+			}
+
+			message := fmt.Sprintf(`<a href="https://nvd.nist.gov/vuln/detail\%s"> %s </a> <br/>%s (%s)<br/>%s`,
+				vinfo.CveID,
+				vinfo.CveID,
+				strconv.FormatFloat(maxCvss.Value.Score, 'f', 1, 64),
+				severity,
+				vinfo.Summaries(config.Conf.Lang, r.Family)[0].Value,
+			)
+
+			if err = postMessage(conf.Room, conf.AuthToken, message); err != nil {
+				return err
+			}
+		}
+
+	}
+	return nil
+}
+
+func postMessage(room, token, message string) error {
+	uri := fmt.Sprintf("https://api.hipchat.com/v2/room/%s/notification?auth_token=%s", room, token)
+
+	payload := url.Values{
+		"color":          {"purple"},
+		"message_format": {"html"},
+		"message":        {message},
+	}
+	reqs, err := http.NewRequest("POST", uri, strings.NewReader(payload.Encode()))
+	if err != nil {
+		return err
+	}
+
+	reqs.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	client := &http.Client{}
+
+	resp, err := client.Do(reqs)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	return nil
+}
--- a/report/http.go
+++ b/report/http.go
@@ -37,7 +37,7 @@ type HTTPResponseWriter struct {
 func (w HTTPResponseWriter) Write(rs ...models.ScanResult) (err error) {
 	res, err := json.Marshal(rs)
 	if err != nil {
-		return xerrors.Errorf("Failed to marshal scan results: %w", err)
+		return xerrors.Errorf("Failed to marshal scah results: %w", err)
 	}
 	w.Writer.Header().Set("Content-Type", "application/json")
 	_, err = w.Writer.Write(res)
--- a/report/localfile.go
+++ b/report/localfile.go
@@ -41,8 +41,14 @@ func (w LocalFileWriter) Write(rs ...models.ScanResult) (err error) {
 			}

 			var b []byte
-			if b, err = json.MarshalIndent(r, "", "    "); err != nil {
-				return xerrors.Errorf("Failed to Marshal to JSON: %w", err)
+			if c.Conf.Debug {
+				if b, err = json.MarshalIndent(r, "", "    "); err != nil {
+					return xerrors.Errorf("Failed to Marshal to JSON: %w", err)
+				}
+			} else {
+				if b, err = json.Marshal(r); err != nil {
+					return xerrors.Errorf("Failed to Marshal to JSON: %w", err)
+				}
 			}
 			if err := writeFile(p, b, 0600); err != nil {
 				return xerrors.Errorf("Failed to write JSON. path: %s, err: %w", p, err)
@@ -96,17 +102,6 @@ func (w LocalFileWriter) Write(rs ...models.ScanResult) (err error) {
 				return xerrors.Errorf("Failed to write XML. path: %s, err: %w", p, err)
 			}
 		}
-
-		if c.Conf.FormatCsvList {
-			p := path + "_short.csv"
-			if c.Conf.Diff {
-				p = path + "_short_diff.csv"
-			}
-			if err := formatCsvList(r, p); err != nil {
-				return xerrors.Errorf("Failed to write CSV: %s, %w", p, err)
-			}
-		}
-
 	}
 	return nil
 }
--- a/report/report.go
+++ b/report/report.go
@@ -1,15 +1,19 @@
-// +build !scanner
-
 package report

 import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
 	"os"
+	"reflect"
+	"regexp"
+	"sort"
 	"strings"
 	"time"

 	"github.com/future-architect/vuls/libmanager"
-	gostdb "github.com/knqyf263/gost/db"

+	"github.com/BurntSushi/toml"
 	"github.com/future-architect/vuls/config"
 	c "github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/contrib/owasp-dependency-check/parser"
@@ -18,128 +22,117 @@ import (
 	"github.com/future-architect/vuls/github"
 	"github.com/future-architect/vuls/gost"
 	"github.com/future-architect/vuls/models"
-	"github.com/future-architect/vuls/msf"
 	"github.com/future-architect/vuls/oval"
 	"github.com/future-architect/vuls/util"
 	"github.com/future-architect/vuls/wordpress"
+	"github.com/hashicorp/go-uuid"
+	gostdb "github.com/knqyf263/gost/db"
 	cvedb "github.com/kotakanbe/go-cve-dictionary/db"
 	cvemodels "github.com/kotakanbe/go-cve-dictionary/models"
 	ovaldb "github.com/kotakanbe/goval-dictionary/db"
 	exploitdb "github.com/mozqnet/go-exploitdb/db"
-	metasploitdb "github.com/takuzoo3868/go-msfdb/db"
 	"golang.org/x/xerrors"
 )

+const (
+	vulsOpenTag  = "<vulsreport>"
+	vulsCloseTag = "</vulsreport>"
+)
+
 // FillCveInfos fills CVE Detailed Information
 func FillCveInfos(dbclient DBClient, rs []models.ScanResult, dir string) ([]models.ScanResult, error) {
-
-	// Use the same reportedAt for all rs
+	var filledResults []models.ScanResult
 	reportedAt := time.Now()
-	for i, r := range rs {
-		if !c.Conf.RefreshCve && !needToRefreshCve(r) {
-			util.Log.Info("No need to refresh")
-			continue
-		}
-
-		if !reuseScannedCves(&r) {
-			r.ScannedCves = models.VulnInfos{}
-		}
-
-		cpeURIs := []string{}
-		if len(r.Container.ContainerID) == 0 {
-			cpeURIs = c.Conf.Servers[r.ServerName].CpeNames
-			owaspDCXMLPath := c.Conf.Servers[r.ServerName].OwaspDCXMLPath
-			if owaspDCXMLPath != "" {
-				cpes, err := parser.Parse(owaspDCXMLPath)
-				if err != nil {
-					return nil, xerrors.Errorf("Failed to read OWASP Dependency Check XML on %s, `%s`, err: %w",
-						r.ServerName, owaspDCXMLPath, err)
-				}
-				cpeURIs = append(cpeURIs, cpes...)
+	hostname, _ := os.Hostname()
+	for _, r := range rs {
+		if c.Conf.RefreshCve || needToRefreshCve(r) {
+			if ovalSupported(&r) {
+				r.ScannedCves = models.VulnInfos{}
 			}
-		} else {
-			// runningContainer
-			if s, ok := c.Conf.Servers[r.ServerName]; ok {
-				if con, ok := s.Containers[r.Container.Name]; ok {
-					cpeURIs = con.Cpes
-					owaspDCXMLPath := con.OwaspDCXMLPath
-					if owaspDCXMLPath != "" {
-						cpes, err := parser.Parse(owaspDCXMLPath)
-						if err != nil {
-							return nil, xerrors.Errorf("Failed to read OWASP Dependency Check XML on %s, `%s`, err: %w",
-								r.ServerInfo(), owaspDCXMLPath, err)
+			cpeURIs := []string{}
+
+			if len(r.Container.ContainerID) == 0 {
+				cpeURIs = c.Conf.Servers[r.ServerName].CpeNames
+				owaspDCXMLPath := c.Conf.Servers[r.ServerName].OwaspDCXMLPath
+				if owaspDCXMLPath != "" {
+					cpes, err := parser.Parse(owaspDCXMLPath)
+					if err != nil {
+						return nil, xerrors.Errorf("Failed to read OWASP Dependency Check XML on %s, `%s`, err: %w",
+							r.ServerName, owaspDCXMLPath, err)
+					}
+					cpeURIs = append(cpeURIs, cpes...)
+				}
+			} else {
+				// runningContainer
+				if s, ok := c.Conf.Servers[r.ServerName]; ok {
+					if con, ok := s.Containers[r.Container.Name]; ok {
+						cpeURIs = con.Cpes
+						owaspDCXMLPath := con.OwaspDCXMLPath
+						if owaspDCXMLPath != "" {
+							cpes, err := parser.Parse(owaspDCXMLPath)
+							if err != nil {
+								return nil, xerrors.Errorf("Failed to read OWASP Dependency Check XML on %s, `%s`, err: %w",
+									r.ServerInfo(), owaspDCXMLPath, err)
+							}
+							cpeURIs = append(cpeURIs, cpes...)
 						}
-						cpeURIs = append(cpeURIs, cpes...)
 					}
 				}
 			}
-		}

-		if err := libmanager.DetectLibsCves(&r); err != nil {
-			return nil, xerrors.Errorf("Failed to fill with Library dependency: %w", err)
-		}
+			// Integrations
+			githubInts := GithubSecurityAlerts(c.Conf.Servers[r.ServerName].GitHubRepos)

-		if err := DetectPkgCves(dbclient, &r); err != nil {
-			return nil, xerrors.Errorf("Failed to detect Pkg CVE: %w", err)
-		}
+			wpOpt := WordPressOption{c.Conf.Servers[r.ServerName].WordPress.WPVulnDBToken}

-		if err := DetectCpeURIsCves(dbclient.CveDB, &r, cpeURIs); err != nil {
-			return nil, xerrors.Errorf("Failed to detect CVE of `%s`: %w", cpeURIs, err)
-		}
-
-		if err := DetectGitHubCves(&r); err != nil {
-			return nil, xerrors.Errorf("Failed to detect GitHub Cves: %w", err)
-		}
-
-		if err := DetectWordPressCves(&r); err != nil {
-			return nil, xerrors.Errorf("Failed to detect WordPress Cves: %w", err)
-		}
-
-		if err := FillCveInfo(dbclient, &r); err != nil {
-			return nil, err
-		}
-
-		r.ReportedBy, _ = os.Hostname()
-		r.Lang = c.Conf.Lang
-		r.ReportedAt = reportedAt
-		r.ReportedVersion = c.Version
-		r.ReportedRevision = c.Revision
-		r.Config.Report = c.Conf
-		r.Config.Report.Servers = map[string]c.ServerInfo{
-			r.ServerName: c.Conf.Servers[r.ServerName],
-		}
-		rs[i] = r
-	}
-
-	// Overwrite the json file every time to clear the fields specified in config.IgnoredJSONKeys
-	for _, r := range rs {
-		if s, ok := c.Conf.Servers[r.ServerName]; ok {
-			r = r.ClearFields(s.IgnoredJSONKeys)
-		}
-		if err := overwriteJSONFile(dir, r); err != nil {
-			return nil, xerrors.Errorf("Failed to write JSON: %w", err)
+			if err := FillCveInfo(dbclient,
+				&r,
+				cpeURIs,
+				true,
+				githubInts,
+				wpOpt); err != nil {
+				return nil, err
+			}
+			r.Lang = c.Conf.Lang
+			r.ReportedAt = reportedAt
+			r.ReportedVersion = c.Version
+			r.ReportedRevision = c.Revision
+			r.ReportedBy = hostname
+			r.Config.Report = c.Conf
+			r.Config.Report.Servers = map[string]c.ServerInfo{
+				r.ServerName: c.Conf.Servers[r.ServerName],
+			}
+			if err := overwriteJSONFile(dir, r); err != nil {
+				return nil, xerrors.Errorf("Failed to write JSON: %w", err)
+			}
+			filledResults = append(filledResults, r)
+		} else {
+			util.Log.Debugf("No need to refresh")
+			filledResults = append(filledResults, r)
 		}
 	}

 	if c.Conf.Diff {
-		prevs, err := loadPrevious(rs)
+		prevs, err := loadPrevious(filledResults)
 		if err != nil {
 			return nil, err
 		}

-		diff, err := diff(rs, prevs)
+		diff, err := diff(filledResults, prevs)
 		if err != nil {
 			return nil, err
 		}
-		for i, r := range diff {
-			if err := fillCvesWithNvdJvn(dbclient.CveDB, &r); err != nil {
+		filledResults = []models.ScanResult{}
+		for _, r := range diff {
+			if err := fillCveDetail(dbclient.CveDB, &r); err != nil {
 				return nil, err
 			}
-			rs[i] = r
+			filledResults = append(filledResults, r)
 		}
 	}

-	for i, r := range rs {
+	filtered := []models.ScanResult{}
+	for _, r := range filledResults {
 		r = r.FilterByCvssOver(c.Conf.CvssScoreOver)
 		r = r.FilterIgnoreCves()
 		r = r.FilterUnfixed()
@@ -148,31 +141,28 @@ func FillCveInfos(dbclient DBClient, rs []models.ScanResult, dir string) ([]mode
 		if c.Conf.IgnoreUnscoredCves {
 			r.ScannedCves = r.ScannedCves.FindScoredVulns()
 		}
-		rs[i] = r
+		filtered = append(filtered, r)
 	}
-	return rs, nil
+	return filtered, nil
 }

-// DetectPkgCves detects OS pkg cves
-func DetectPkgCves(dbclient DBClient, r *models.ScanResult) error {
-	// Pkg Scan
-	if r.Release != "" {
-		// OVAL
-		if err := detectPkgsCvesWithOval(dbclient.OvalDB, r); err != nil {
-			return xerrors.Errorf("Failed to detect CVE with OVAL: %w", err)
-		}
+// FillCveInfo fill scanResult with cve info.
+func FillCveInfo(dbclient DBClient, r *models.ScanResult, cpeURIs []string, ignoreWillNotFix bool, integrations ...Integration) error {
+	util.Log.Debugf("need to refresh")

-		// gost
-		if err := detectPkgsCvesWithGost(dbclient.GostDB, r); err != nil {
-			return xerrors.Errorf("Failed to detect CVE with gost: %w", err)
-		}
-	} else if reuseScannedCves(r) {
-		util.Log.Infof("r.Release is empty. Use CVEs as it as.")
-	} else if r.Family == config.ServerTypePseudo {
-		util.Log.Infof("pseudo type. Skip OVAL and gost detection")
-	} else {
-		return xerrors.Errorf("Failed to fill CVEs. r.Release is empty")
+	nCVEs, err := libmanager.FillLibrary(r)
+	if err != nil {
+		return xerrors.Errorf("Failed to fill with Library dependency: %w", err)
 	}
+	util.Log.Infof("%s: %d CVEs are detected with Library",
+		r.FormatServerName(), nCVEs)
+
+	nCVEs, err = FillWithOval(dbclient.OvalDB, r)
+	if err != nil {
+		return xerrors.Errorf("Failed to fill with OVAL: %w", err)
+	}
+	util.Log.Infof("%s: %d CVEs are detected with OVAL",
+		r.FormatServerName(), nCVEs)

 	for i, v := range r.ScannedCves {
 		for j, p := range v.AffectedPackages {
@@ -183,105 +173,46 @@ func DetectPkgCves(dbclient DBClient, r *models.ScanResult) error {
 		}
 	}

-	// To keep backward compatibility
-	// Newer versions use ListenPortStats,
-	// but older versions of Vuls are set to ListenPorts.
-	// Set ListenPorts to ListenPortStats to allow newer Vuls to report old results.
-	for i, pkg := range r.Packages {
-		for j, proc := range pkg.AffectedProcs {
-			for _, ipPort := range proc.ListenPorts {
-				ps, err := models.NewPortStat(ipPort)
-				if err != nil {
-					util.Log.Warnf("Failed to parse ip:port: %s, err:%+v", ipPort, err)
-					continue
-				}
-				r.Packages[i].AffectedProcs[j].ListenPortStats = append(
-					r.Packages[i].AffectedProcs[j].ListenPortStats, *ps)
-			}
-		}
+	nCVEs, err = fillVulnByCpeURIs(dbclient.CveDB, r, cpeURIs)
+	if err != nil {
+		return xerrors.Errorf("Failed to detect vulns of `%s`: %w", cpeURIs, err)
 	}
-
-	return nil
-}
-
-// DetectGitHubCves fetches CVEs from GitHub Security Alerts
-func DetectGitHubCves(r *models.ScanResult) error {
-	repos := c.Conf.Servers[r.ServerName].GitHubRepos
-	if len(repos) == 0 {
-		return nil
-	}
-	githubInts := GithubSecurityAlerts(repos)
+	util.Log.Infof("%s: %d CVEs are detected with CPE", r.FormatServerName(), nCVEs)

 	ints := &integrationResults{}
-	for _, o := range []Integration{githubInts} {
-		if err := o.apply(r, ints); err != nil {
-			return xerrors.Errorf("Failed to detect CVE with integration: %w", err)
+	for _, o := range integrations {
+		if err = o.apply(r, ints); err != nil {
+			return xerrors.Errorf("Failed to fill with integration: %w", err)
 		}
 	}
-	util.Log.Infof("%s: %d CVEs are detected with GitHub Security Alerts",
-		r.FormatServerName(), ints.GithubAlertsCveCounts)
-	return nil
-}
+	util.Log.Infof("%s: %d CVEs are detected with GitHub Security Alerts", r.FormatServerName(), ints.GithubAlertsCveCounts)

-// DetectWordPressCves detects CVEs of WordPress
-func DetectWordPressCves(r *models.ScanResult) error {
-	token := c.Conf.Servers[r.ServerName].WordPress.WPVulnDBToken
-	if token == "" {
-		return nil
-	}
-	wpVulnCaches := map[string]string{}
-	wpOpt := WordPressOption{
-		token,
-		&wpVulnCaches,
-	}
-
-	ints := &integrationResults{}
-	for _, o := range []Integration{wpOpt} {
-		if err := o.apply(r, ints); err != nil {
-			return xerrors.Errorf("Failed to detect CVE with integration: %w", err)
-		}
-	}
-	util.Log.Infof("%s: %d CVEs are detected with wpscan API",
-		r.FormatServerName(), ints.WordPressCveCounts)
-	return nil
-}
-
-// FillCveInfo fill scanResult with cve info.
-func FillCveInfo(dbclient DBClient, r *models.ScanResult) error {
-	util.Log.Infof("Fill CVE detailed with gost")
-	if err := gost.NewClient(r.Family).FillCVEsWithRedHat(dbclient.GostDB, r); err != nil {
+	nCVEs, err = FillWithGost(dbclient.GostDB, r, ignoreWillNotFix)
+	if err != nil {
 		return xerrors.Errorf("Failed to fill with gost: %w", err)
 	}
+	util.Log.Infof("%s: %d unfixed CVEs are detected with gost",
+		r.FormatServerName(), nCVEs)

-	util.Log.Infof("Fill CVE detailed with CVE-DB")
-	if err := fillCvesWithNvdJvn(dbclient.CveDB, r); err != nil {
+	util.Log.Infof("Fill CVE detailed information with CVE-DB")
+	if err := fillCveDetail(dbclient.CveDB, r); err != nil {
 		return xerrors.Errorf("Failed to fill with CVE: %w", err)
 	}

-	util.Log.Infof("Fill exploit with Exploit-DB")
-	nExploitCve, err := fillWithExploitDB(dbclient.ExploitDB, r)
+	util.Log.Infof("Fill exploit information with Exploit-DB")
+	nExploitCve, err := FillWithExploit(dbclient.ExploitDB, r)
 	if err != nil {
 		return xerrors.Errorf("Failed to fill with exploit: %w", err)
 	}
 	util.Log.Infof("%s: %d exploits are detected",
 		r.FormatServerName(), nExploitCve)

-	util.Log.Infof("Fill metasploit module with Metasploit-DB")
-	nMetasploitCve, err := fillWithMetasploit(dbclient.MetasploitDB, r)
-	if err != nil {
-		return xerrors.Errorf("Failed to fill with metasploit: %w", err)
-	}
-	util.Log.Infof("%s: %d modules are detected",
-		r.FormatServerName(), nMetasploitCve)
-
-	util.Log.Infof("Fill CWE with NVD")
 	fillCweDict(r)
-
 	return nil
 }

-// fillCvesWithNvdJvn fills CVE detail with NVD, JVN
-func fillCvesWithNvdJvn(driver cvedb.DB, r *models.ScanResult) error {
+// fillCveDetail fetches NVD, JVN from CVE Database
+func fillCveDetail(driver cvedb.DB, r *models.ScanResult) error {
 	cveIDs := []string{}
 	for _, v := range r.ScannedCves {
 		cveIDs = append(cveIDs, v.CveID)
@@ -292,7 +223,7 @@ func fillCvesWithNvdJvn(driver cvedb.DB, r *models.ScanResult) error {
 		return err
 	}
 	for _, d := range ds {
-		nvd, exploits, mitigations := models.ConvertNvdJSONToModel(d.CveID, d.NvdJSON)
+		nvd := models.ConvertNvdJSONToModel(d.CveID, d.NvdJSON)
 		jvn := models.ConvertJvnToModel(d.CveID, d.Jvn)

 		alerts := fillCertAlerts(&d)
@@ -307,8 +238,6 @@ func fillCvesWithNvdJvn(driver cvedb.DB, r *models.ScanResult) error {
 					}
 				}
 				vinfo.AlertDict = alerts
-				vinfo.Exploits = append(vinfo.Exploits, exploits...)
-				vinfo.Mitigations = append(vinfo.Mitigations, mitigations...)
 				r.ScannedCves[cveID] = vinfo
 				break
 			}
@@ -339,13 +268,13 @@ func fillCertAlerts(cvedetail *cvemodels.CveDetail) (dict models.AlertDict) {
 	return dict
 }

-// detectPkgsCvesWithOval fetches OVAL database
-func detectPkgsCvesWithOval(driver ovaldb.DB, r *models.ScanResult) error {
+// FillWithOval fetches OVAL database
+func FillWithOval(driver ovaldb.DB, r *models.ScanResult) (nCVEs int, err error) {
 	var ovalClient oval.Client
 	var ovalFamily string

 	switch r.Family {
-	case c.Debian, c.Raspbian:
+	case c.Debian:
 		ovalClient = oval.NewDebian()
 		ovalFamily = c.Debian
 	case c.Ubuntu:
@@ -371,81 +300,73 @@ func detectPkgsCvesWithOval(driver ovaldb.DB, r *models.ScanResult) error {
 	case c.Amazon:
 		ovalClient = oval.NewAmazon()
 		ovalFamily = c.Amazon
-	case c.FreeBSD, c.Windows:
-		return nil
+	case c.Raspbian, c.FreeBSD, c.Windows:
+		return 0, nil
 	case c.ServerTypePseudo:
-		return nil
+		return 0, nil
 	default:
 		if r.Family == "" {
-			return xerrors.New("Probably an error occurred during scanning. Check the error message")
+			return 0, xerrors.New("Probably an error occurred during scanning. Check the error message")
 		}
-		return xerrors.Errorf("OVAL for %s is not implemented yet", r.Family)
+		return 0, xerrors.Errorf("OVAL for %s is not implemented yet", r.Family)
 	}

 	if !c.Conf.OvalDict.IsFetchViaHTTP() {
 		if driver == nil {
-			return xerrors.Errorf("You have to fetch OVAL data for %s before reporting. For details, see `https://github.com/kotakanbe/goval-dictionary#usage`", r.Family)
+			return 0, xerrors.Errorf("You have to fetch OVAL data for %s before reporting. For details, see `https://github.com/kotakanbe/goval-dictionary#usage`", r.Family)
 		}
-		if err := driver.NewOvalDB(ovalFamily); err != nil {
-			return xerrors.Errorf("Failed to New Oval DB. err: %w", err)
+		if err = driver.NewOvalDB(ovalFamily); err != nil {
+			return 0, xerrors.Errorf("Failed to New Oval DB. err: %w", err)
 		}
 	}

 	util.Log.Debugf("Check whether oval fetched: %s %s", ovalFamily, r.Release)
 	ok, err := ovalClient.CheckIfOvalFetched(driver, ovalFamily, r.Release)
 	if err != nil {
-		return err
+		return 0, err
 	}
 	if !ok {
-		return xerrors.Errorf("OVAL entries of %s %s are not found. Fetch OVAL before reporting. For details, see `https://github.com/kotakanbe/goval-dictionary#usage`", ovalFamily, r.Release)
+		return 0, xerrors.Errorf("OVAL entries of %s %s are not found. Fetch OVAL before reporting. For details, see `https://github.com/kotakanbe/goval-dictionary#usage`", ovalFamily, r.Release)
 	}

 	_, err = ovalClient.CheckIfOvalFresh(driver, ovalFamily, r.Release)
 	if err != nil {
-		return err
+		return 0, err
 	}

-	nCVEs, err := ovalClient.FillWithOval(driver, r)
-	if err != nil {
-		return err
+	return ovalClient.FillWithOval(driver, r)
+}
+
+// FillWithGost fills CVEs with gost dataabase
+// https://github.com/knqyf263/gost
+func FillWithGost(driver gostdb.DB, r *models.ScanResult, ignoreWillNotFix bool) (nCVEs int, err error) {
+	gostClient := gost.NewClient(r.Family)
+	// TODO chekc if fetched
+	// TODO chekc if fresh enough
+	if nCVEs, err = gostClient.DetectUnfixed(driver, r, ignoreWillNotFix); err != nil {
+		return
 	}
-
-	util.Log.Infof("%s: %d CVEs are detected with OVAL", r.FormatServerName(), nCVEs)
-	return nil
+	return nCVEs, gostClient.FillCVEsWithRedHat(driver, r)
 }

-func detectPkgsCvesWithGost(driver gostdb.DB, r *models.ScanResult) error {
-	nCVEs, err := gost.NewClient(r.Family).DetectUnfixed(driver, r, true)
-
-	util.Log.Infof("%s: %d unfixed CVEs are detected with gost",
-		r.FormatServerName(), nCVEs)
-	return err
-}
-
-// fillWithExploitDB fills Exploits with exploit dataabase
+// FillWithExploit fills Exploits with exploit dataabase
 // https://github.com/mozqnet/go-exploitdb
-func fillWithExploitDB(driver exploitdb.DB, r *models.ScanResult) (nExploitCve int, err error) {
+func FillWithExploit(driver exploitdb.DB, r *models.ScanResult) (nExploitCve int, err error) {
+	// TODO chekc if fetched
+	// TODO chekc if fresh enough
 	return exploit.FillWithExploit(driver, r)
 }

-// fillWithMetasploit fills metasploit modules with metasploit database
-// https://github.com/takuzoo3868/go-msfdb
-func fillWithMetasploit(driver metasploitdb.DB, r *models.ScanResult) (nMetasploitCve int, err error) {
-	return msf.FillWithMetasploit(driver, r)
-}
-
-// DetectCpeURIsCves detects CVEs of given CPE-URIs
-func DetectCpeURIsCves(driver cvedb.DB, r *models.ScanResult, cpeURIs []string) error {
-	nCVEs := 0
+func fillVulnByCpeURIs(driver cvedb.DB, r *models.ScanResult, cpeURIs []string) (nCVEs int, err error) {
 	if len(cpeURIs) != 0 && driver == nil && !config.Conf.CveDict.IsFetchViaHTTP() {
-		return xerrors.Errorf("cpeURIs %s specified, but cve-dictionary DB not found. Fetch cve-dictionary before reporting. For details, see `https://github.com/kotakanbe/go-cve-dictionary#deploy-go-cve-dictionary`",
+		return 0, xerrors.Errorf("cpeURIs %s specified, but cve-dictionary DB not found. Fetch cve-dictionary beofre reporting. For details, see `https://github.com/kotakanbe/go-cve-dictionary#deploy-go-cve-dictionary`",
 			cpeURIs)
 	}

 	for _, name := range cpeURIs {
 		details, err := CveClient.FetchCveDetailsByCpeName(driver, name)
 		if err != nil {
-			return err
+			return 0, err
 		}
 		for _, detail := range details {
 			if val, ok := r.ScannedCves[detail.CveID]; ok {
@@ -465,8 +386,7 @@ func DetectCpeURIsCves(driver cvedb.DB, r *models.ScanResult, cpeURIs []string)
 			}
 		}
 	}
-	util.Log.Infof("%s: %d CVEs are detected with CPE", r.FormatServerName(), nCVEs)
-	return nil
+	return nCVEs, nil
 }

 type integrationResults struct {
@@ -509,15 +429,14 @@ func (g GithubSecurityAlertOption) apply(r *models.ScanResult, ints *integration

 // WordPressOption :
 type WordPressOption struct {
-	token        string
-	wpVulnCaches *map[string]string
+	token string
 }

 func (g WordPressOption) apply(r *models.ScanResult, ints *integrationResults) (err error) {
 	if g.token == "" {
 		return nil
 	}
-	n, err := wordpress.FillWordPress(r, g.token, g.wpVulnCaches)
+	n, err := wordpress.FillWordPress(r, g.token)
 	if err != nil {
 		return xerrors.Errorf("Failed to fetch from WPVulnDB. Check the WPVulnDBToken in config.toml. err: %w", err)
 	}
@@ -579,3 +498,266 @@ func fillCweDict(r *models.ScanResult) {
 	r.CweDict = dict
 	return
 }
+
+const reUUID = "[\\da-f]{8}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{12}"
+
+// Scanning with the -containers-only flag at scan time, the UUID of Container Host may not be generated,
+// so check it. Otherwise create a UUID of the Container Host and set it.
+func getOrCreateServerUUID(r models.ScanResult, server c.ServerInfo) (serverUUID string, err error) {
+	if id, ok := server.UUIDs[r.ServerName]; !ok {
+		if serverUUID, err = uuid.GenerateUUID(); err != nil {
+			return "", xerrors.Errorf("Failed to generate UUID: %w", err)
+		}
+	} else {
+		matched, err := regexp.MatchString(reUUID, id)
+		if !matched || err != nil {
+			if serverUUID, err = uuid.GenerateUUID(); err != nil {
+				return "", xerrors.Errorf("Failed to generate UUID: %w", err)
+			}
+		}
+	}
+	return serverUUID, nil
+}
+
+// EnsureUUIDs generate a new UUID of the scan target server if UUID is not assigned yet.
+// And then set the generated UUID to config.toml and scan results.
+func EnsureUUIDs(configPath string, results models.ScanResults) (err error) {
+	// Sort Host->Container
+	sort.Slice(results, func(i, j int) bool {
+		if results[i].ServerName == results[j].ServerName {
+			return results[i].Container.ContainerID < results[j].Container.ContainerID
+		}
+		return results[i].ServerName < results[j].ServerName
+	})
+
+	re := regexp.MustCompile(reUUID)
+	for i, r := range results {
+		server := c.Conf.Servers[r.ServerName]
+		if server.UUIDs == nil {
+			server.UUIDs = map[string]string{}
+		}
+
+		name := ""
+		if r.IsContainer() {
+			name = fmt.Sprintf("%s@%s", r.Container.Name, r.ServerName)
+			serverUUID, err := getOrCreateServerUUID(r, server)
+			if err != nil {
+				return err
+			}
+			if serverUUID != "" {
+				server.UUIDs[r.ServerName] = serverUUID
+			}
+		} else {
+			name = r.ServerName
+		}
+
+		if id, ok := server.UUIDs[name]; ok {
+			ok := re.MatchString(id)
+			if !ok || err != nil {
+				util.Log.Warnf("UUID is invalid. Re-generate UUID %s: %s", id, err)
+			} else {
+				if r.IsContainer() {
+					results[i].Container.UUID = id
+					results[i].ServerUUID = server.UUIDs[r.ServerName]
+				} else {
+					results[i].ServerUUID = id
+				}
+				// continue if the UUID has already assigned and valid
+				continue
+			}
+		}
+
+		// Generate a new UUID and set to config and scan result
+		serverUUID, err := uuid.GenerateUUID()
+		if err != nil {
+			return err
+		}
+		server.UUIDs[name] = serverUUID
+		server = cleanForTOMLEncoding(server, c.Conf.Default)
+		c.Conf.Servers[r.ServerName] = server
+
+		if r.IsContainer() {
+			results[i].Container.UUID = serverUUID
+			results[i].ServerUUID = server.UUIDs[r.ServerName]
+		} else {
+			results[i].ServerUUID = serverUUID
+		}
+	}
+
+	for name, server := range c.Conf.Servers {
+		server = cleanForTOMLEncoding(server, c.Conf.Default)
+		c.Conf.Servers[name] = server
+	}
+
+	email := &c.Conf.EMail
+	if email.SMTPAddr == "" {
+		email = nil
+	}
+
+	slack := &c.Conf.Slack
+	if slack.HookURL == "" {
+		slack = nil
+	}
+
+	cveDict := &c.Conf.CveDict
+	ovalDict := &c.Conf.OvalDict
+	gost := &c.Conf.Gost
+	exploit := &c.Conf.Exploit
+	http := &c.Conf.HTTP
+	if http.URL == "" {
+		http = nil
+	}
+
+	syslog := &c.Conf.Syslog
+	if syslog.Host == "" {
+		syslog = nil
+	}
+
+	aws := &c.Conf.AWS
+	if aws.S3Bucket == "" {
+		aws = nil
+	}
+
+	azure := &c.Conf.Azure
+	if azure.AccountName == "" {
+		azure = nil
+	}
+
+	stride := &c.Conf.Stride
+	if stride.HookURL == "" {
+		stride = nil
+	}
+
+	hipChat := &c.Conf.HipChat
+	if hipChat.AuthToken == "" {
+		hipChat = nil
+	}
+
+	chatWork := &c.Conf.ChatWork
+	if chatWork.APIToken == "" {
+		chatWork = nil
+	}
+
+	saas := &c.Conf.Saas
+	if saas.GroupID == 0 {
+		saas = nil
+	}
+
+	c := struct {
+		CveDict  *c.GoCveDictConf `toml:"cveDict"`
+		OvalDict *c.GovalDictConf `toml:"ovalDict"`
+		Gost     *c.GostConf      `toml:"gost"`
+		Exploit  *c.ExploitConf   `toml:"exploit"`
+		Slack    *c.SlackConf     `toml:"slack"`
+		Email    *c.SMTPConf      `toml:"email"`
+		HTTP     *c.HTTPConf      `toml:"http"`
+		Syslog   *c.SyslogConf    `toml:"syslog"`
+		AWS      *c.AWS           `toml:"aws"`
+		Azure    *c.Azure         `toml:"azure"`
+		Stride   *c.StrideConf    `toml:"stride"`
+		HipChat  *c.HipChatConf   `toml:"hipChat"`
+		ChatWork *c.ChatWorkConf  `toml:"chatWork"`
+		Saas     *c.SaasConf      `toml:"saas"`
+
+		Default c.ServerInfo            `toml:"default"`
+		Servers map[string]c.ServerInfo `toml:"servers"`
+	}{
+		CveDict:  cveDict,
+		OvalDict: ovalDict,
+		Gost:     gost,
+		Exploit:  exploit,
+		Slack:    slack,
+		Email:    email,
+		HTTP:     http,
+		Syslog:   syslog,
+		AWS:      aws,
+		Azure:    azure,
+		Stride:   stride,
+		HipChat:  hipChat,
+		ChatWork: chatWork,
+		Saas:     saas,
+
+		Default: c.Conf.Default,
+		Servers: c.Conf.Servers,
+	}
+
+	// rename the current config.toml to config.toml.bak
+	info, err := os.Lstat(configPath)
+	if err != nil {
+		return xerrors.Errorf("Failed to lstat %s: %w", configPath, err)
+	}
+	realPath := configPath
+	if info.Mode()&os.ModeSymlink == os.ModeSymlink {
+		if realPath, err = os.Readlink(configPath); err != nil {
+			return xerrors.Errorf("Failed to Read link %s: %w", configPath, err)
+		}
+	}
+	if err := os.Rename(realPath, realPath+".bak"); err != nil {
+		return xerrors.Errorf("Failed to rename %s: %w", configPath, err)
+	}
+
+	var buf bytes.Buffer
+	if err := toml.NewEncoder(&buf).Encode(c); err != nil {
+		return xerrors.Errorf("Failed to encode to toml: %w", err)
+	}
+	str := strings.Replace(buf.String(), "\n  [", "\n\n  [", -1)
+	str = fmt.Sprintf("%s\n\n%s",
+		"# See REAME for details: https://vuls.io/docs/en/usage-settings.html",
+		str)
+
+	return ioutil.WriteFile(realPath, []byte(str), 0600)
+}
+
+func cleanForTOMLEncoding(server c.ServerInfo, def c.ServerInfo) c.ServerInfo {
+	if reflect.DeepEqual(server.Optional, def.Optional) {
+		server.Optional = nil
+	}
+
+	if def.User == server.User {
+		server.User = ""
+	}
+
+	if def.Host == server.Host {
+		server.Host = ""
+	}
+
+	if def.Port == server.Port {
+		server.Port = ""
+	}
+
+	if def.KeyPath == server.KeyPath {
+		server.KeyPath = ""
+	}
+
+	if reflect.DeepEqual(server.ScanMode, def.ScanMode) {
+		server.ScanMode = nil
+	}
+
+	if def.Type == server.Type {
+		server.Type = ""
+	}
+
+	if reflect.DeepEqual(server.CpeNames, def.CpeNames) {
+		server.CpeNames = nil
+	}
+
+	if def.OwaspDCXMLPath == server.OwaspDCXMLPath {
+		server.OwaspDCXMLPath = ""
+	}
+
+	if reflect.DeepEqual(server.IgnoreCves, def.IgnoreCves) {
+		server.IgnoreCves = nil
+	}
+
+	if reflect.DeepEqual(server.Enablerepo, def.Enablerepo) {
+		server.Enablerepo = nil
+	}
+
+	for k, v := range def.Optional {
+		if vv, ok := server.Optional[k]; ok && v == vv {
+			delete(server.Optional, k)
+		}
+	}
+
+	return server
+}
--- a/report/report_test.go
+++ b/report/report_test.go
@@ -1,9 +1,10 @@
-package saas
+package report

 import (
 	"testing"

 	"github.com/future-architect/vuls/config"
+
 	"github.com/future-architect/vuls/models"
 )

--- a/report/saas.go
+++ b/report/saas.go
@@ -1,14 +1,16 @@
-package saas
+package report

 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
 	"strings"
+	"time"

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -21,8 +23,8 @@ import (
 	"golang.org/x/xerrors"
 )

-// Writer writes results to SaaS
-type Writer struct{}
+// SaasWriter writes results to SaaS
+type SaasWriter struct{}

 // TempCredential : TempCredential
 type TempCredential struct {
@@ -40,7 +42,7 @@ type payload struct {
 }

 // UploadSaas : UploadSaas
-func (w Writer) Write(rs ...models.ScanResult) (err error) {
+func (w SaasWriter) Write(rs ...models.ScanResult) (err error) {
 	// dir string, configPath string, config *c.Config
 	if len(rs) == 0 {
 		return nil
@@ -140,3 +142,11 @@ func (w Writer) Write(rs ...models.ScanResult) (err error) {
 	util.Log.Infof("done")
 	return nil
 }
+
+func renameKeyNameUTC(scannedAt time.Time, uuid string, container models.Container) string {
+	timestr := scannedAt.UTC().Format(time.RFC3339)
+	if len(container.ContainerID) == 0 {
+		return fmt.Sprintf("%s/%s.json", timestr, uuid)
+	}
+	return fmt.Sprintf("%s/%s@%s.json", timestr, container.UUID, uuid)
+}
--- a/report/slack.go
+++ b/report/slack.go
@@ -277,8 +277,9 @@ func attachmentText(vinfo models.VulnInfo, osFamily string, cweDict map[string]m
 		} else {
 			if 0 < len(vinfo.DistroAdvisories) {
 				links := []string{}
-				for _, v := range vinfo.CveContents.PrimarySrcURLs(config.Conf.Lang, osFamily, vinfo.CveID) {
-					links = append(links, fmt.Sprintf("<%s|%s>", v.Value, v.Type))
+				for k, v := range vinfo.VendorLinks(osFamily) {
+					links = append(links, fmt.Sprintf("<%s|%s>",
+						v, k))
 				}

 				v := fmt.Sprintf("<%s|%s> %s (%s)",
@@ -302,8 +303,9 @@ func attachmentText(vinfo models.VulnInfo, osFamily string, cweDict map[string]m
 	}

 	mitigation := ""
-	for _, m := range vinfo.Mitigations {
-		mitigation = fmt.Sprintf("\nMitigation:\n<%s|%s>", m.URL, m.CveContentType)
+	if vinfo.Mitigations(osFamily)[0].Type != models.Unknown {
+		mitigation = fmt.Sprintf("\nMitigation:\n```%s```\n",
+			vinfo.Mitigations(osFamily)[0].Value)
 	}

 	return fmt.Sprintf("*%4.1f (%s)* %s %s\n%s\n```\n%s\n```%s\n%s\n",
--- a/report/stdout.go
+++ b/report/stdout.go
@@ -13,7 +13,7 @@ type StdoutWriter struct{}
 // WriteScanSummary prints Scan summary at the end of scan
 func (w StdoutWriter) WriteScanSummary(rs ...models.ScanResult) {
 	fmt.Printf("\n\n")
-	fmt.Println("Scan Summary")
+	fmt.Println("One Line Summary")
 	fmt.Println("================")
 	fmt.Printf("%s\n", formatScanSummary(rs...))
 }
@@ -27,7 +27,7 @@ func (w StdoutWriter) Write(rs ...models.ScanResult) error {
 		fmt.Print("\n")
 	}

-	if c.Conf.FormatList || c.Conf.FormatCsvList {
+	if c.Conf.FormatList {
 		for _, r := range rs {
 			fmt.Println(formatList(r))
 		}
--- a/report/stride.go
+++ b/report/stride.go
@@ -0,0 +1,81 @@
+package report
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+
+	"strconv"
+	"strings"
+
+	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/models"
+)
+
+// StrideWriter send report to Stride
+type StrideWriter struct{}
+type strideSender struct{}
+
+func (w StrideWriter) Write(rs ...models.ScanResult) (err error) {
+	conf := config.Conf.Stride
+
+	for _, r := range rs {
+		w := strideSender{}
+
+		serverInfo := fmt.Sprintf("%s", r.ServerInfo())
+		message := fmt.Sprintf(`{"body":{"version":1,"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":" %s  "}]}]}}`,
+			serverInfo,
+		)
+		if err = w.sendMessage(conf.HookURL, conf.AuthToken, message); err != nil {
+			return err
+		}
+
+		for _, vinfo := range r.ScannedCves {
+			maxCvss := vinfo.MaxCvssScore()
+			severity := strings.ToUpper(maxCvss.Value.Severity)
+			if severity == "" {
+				severity = "?"
+			}
+
+			message = fmt.Sprintf(`{"body":{"version":1,"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":" %s ","marks": [ { "type": "link", "attrs": { "href": "https://nvd.nist.gov/vuln/detail/%s", "title": "cve" } } ]}]}]}}`,
+				vinfo.CveID,
+				vinfo.CveID,
+			)
+			if err = w.sendMessage(conf.HookURL, conf.AuthToken, message); err != nil {
+				return err
+			}
+
+			message = fmt.Sprintf(`{"body":{"version":1,"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":" %s (%s) "}]}]}}`,
+				strconv.FormatFloat(maxCvss.Value.Score, 'f', 1, 64),
+				severity,
+			)
+			if err = w.sendMessage(conf.HookURL, conf.AuthToken, message); err != nil {
+				return err
+			}
+
+			message = fmt.Sprintf(`{"body":{"version":1,"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":" %s "}]}]}}`,
+				vinfo.Summaries(config.Conf.Lang, r.Family)[0].Value,
+			)
+			if err = w.sendMessage(conf.HookURL, conf.AuthToken, message); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (w strideSender) sendMessage(uri, token, jsonStr string) error {
+	reqs, err := http.NewRequest("POST", uri, bytes.NewBuffer([]byte(jsonStr)))
+	if err != nil {
+		return err
+	}
+	reqs.Header.Add("Content-Type", "application/json")
+	reqs.Header.Add("Authorization", "Bearer "+token)
+	client := &http.Client{}
+	resp, err := client.Do(reqs)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	return nil
+}
--- a/report/syslog.go
+++ b/report/syslog.go
@@ -69,7 +69,7 @@ func (w SyslogWriter) encodeSyslog(result models.ScanResult) (messages []string)
 			kvPairs = append(kvPairs, fmt.Sprintf(`cvss_vector_%s_v3="%s"`, cvss.Type, cvss.Value.Vector))
 		}

-		if content, ok := vinfo.CveContents[models.Nvd]; ok {
+		if content, ok := vinfo.CveContents[models.NvdXML]; ok {
 			cwes := strings.Join(content.CweIDs, ",")
 			kvPairs = append(kvPairs, fmt.Sprintf(`cwe_ids="%s"`, cwes))
 			if config.Conf.Syslog.Verbose {
--- a/report/syslog_test.go
+++ b/report/syslog_test.go
@@ -33,14 +33,11 @@ func TestSyslogWriterEncodeSyslog(t *testing.T) {
 							models.PackageFixStatus{Name: "pkg4"},
 						},
 						CveContents: models.CveContents{
-							models.Nvd: models.CveContent{
+							models.NvdXML: models.CveContent{
 								Cvss2Score:    5.0,
 								Cvss2Vector:   "AV:L/AC:L/Au:N/C:N/I:N/A:C",
 								Cvss2Severity: "MEDIUM",
 								CweIDs:        []string{"CWE-20"},
-								Cvss3Score:    9.8,
-								Cvss3Vector:   "AV:L/AC:L/Au:N/C:N/I:N/A:C",
-								Cvss3Severity: "HIGH",
 							},
 						},
 					},
@@ -48,7 +45,7 @@ func TestSyslogWriterEncodeSyslog(t *testing.T) {
 			},
 			expectedMessages: []string{
 				`scanned_at="2018-06-13 16:10:00 +0000 UTC" server_name="teste01" os_family="ubuntu" os_release="16.04" ipv4_addr="192.168.0.1,10.0.2.15" ipv6_addr="" packages="pkg1,pkg2" cve_id="CVE-2017-0001"`,
-				`scanned_at="2018-06-13 16:10:00 +0000 UTC" server_name="teste01" os_family="ubuntu" os_release="16.04" ipv4_addr="192.168.0.1,10.0.2.15" ipv6_addr="" packages="pkg3,pkg4" cve_id="CVE-2017-0002" cvss_score_nvd_v2="5.00" cvss_vector_nvd_v2="AV:L/AC:L/Au:N/C:N/I:N/A:C" cvss_score_nvd_v3="9.80" cvss_vector_nvd_v3="AV:L/AC:L/Au:N/C:N/I:N/A:C" cwe_ids="CWE-20"`,
+				`scanned_at="2018-06-13 16:10:00 +0000 UTC" server_name="teste01" os_family="ubuntu" os_release="16.04" ipv4_addr="192.168.0.1,10.0.2.15" ipv6_addr="" packages="pkg3,pkg4" cve_id="CVE-2017-0002" cvss_score_nvdxml_v2="5.00" cvss_vector_nvdxml_v2="AV:L/AC:L/Au:N/C:N/I:N/A:C" cwe_ids="CWE-20"`,
 			},
 		},
 		{
--- a/report/tui.go
+++ b/report/tui.go
@@ -617,18 +617,8 @@ func summaryLines(r models.ScanResult) string {
 		pkgNames = append(pkgNames, vinfo.WpPackageFixStats.Names()...)
 		pkgNames = append(pkgNames, vinfo.LibraryFixedIns.Names()...)

-		av := vinfo.AttackVector()
-		for _, pname := range vinfo.AffectedPackages.Names() {
-			if r.Packages[pname].HasReachablePort() {
-				av = fmt.Sprintf("%s ◉", av)
-				break
-			}
-		}
-
 		exploits := ""
-		if 0 < len(vinfo.Metasploits) {
-			exploits = "EXP"
-		} else if 0 < len(vinfo.Exploits) {
+		if 0 < len(vinfo.Exploits) {
 			exploits = "POC"
 		}

@@ -637,7 +627,7 @@ func summaryLines(r models.ScanResult) string {
 			fmt.Sprintf(indexFormat, i+1),
 			vinfo.CveID,
 			cvssScore + " |",
-			fmt.Sprintf("%-6s |", av),
+			fmt.Sprintf("%4s |", vinfo.AttackVector()),
 			fmt.Sprintf("%3s |", exploits),
 			fmt.Sprintf("%6s |", vinfo.AlertDict.FormatSource()),
 			fmt.Sprintf("%7s |", vinfo.PatchStatus(r.Packages)),
@@ -649,7 +639,6 @@ func summaryLines(r models.ScanResult) string {
 		}
 		stable.AddRow(icols...)
 	}
-
 	return fmt.Sprintf("%s", stable)
 }

@@ -721,23 +710,8 @@ func setChangelogLayout(g *gocui.Gui) error {

 				if len(pack.AffectedProcs) != 0 {
 					for _, p := range pack.AffectedProcs {
-						if len(p.ListenPortStats) == 0 {
-							lines = append(lines, fmt.Sprintf("  * PID: %s %s Port: []",
-								p.PID, p.Name))
-							continue
-						}
-
-						var ports []string
-						for _, pp := range p.ListenPortStats {
-							if len(pp.PortReachableTo) == 0 {
-								ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port))
-							} else {
-								ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo))
-							}
-						}
-
 						lines = append(lines, fmt.Sprintf("  * PID: %s %s Port: %s",
-							p.PID, p.Name, ports))
+							p.PID, p.Name, p.ListenPorts))
 					}
 				}
 			}
@@ -771,7 +745,7 @@ func setChangelogLayout(g *gocui.Gui) error {
 		}

 		for _, l := range vinfo.LibraryFixedIns {
-			libs := r.LibraryScanners.Find(l.Path, l.Name)
+			libs := r.LibraryScanners.Find(l.Name)
 			for path, lib := range libs {
 				lines = append(lines, fmt.Sprintf("%s-%s, FixedIn: %s (%s)",
 					lib.Name, lib.Version, l.FixedIn, path))
@@ -796,21 +770,6 @@ func setChangelogLayout(g *gocui.Gui) error {
 			}
 		}

-		if len(vinfo.Metasploits) != 0 {
-			lines = append(lines, "\n",
-				"Metasploit Modules",
-				"==================",
-			)
-			for _, module := range vinfo.Metasploits {
-				lines = append(lines, fmt.Sprintf("* %s: %s", module.Name, module.Description))
-				if 0 < len(module.URLs) {
-					for _, u := range module.URLs {
-						lines = append(lines, fmt.Sprintf(" - %s", u))
-					}
-				}
-			}
-		}
-
 		if len(vinfo.AlertDict.En) > 0 {
 			lines = append(lines, "\n",
 				"USCERT Alert",
@@ -863,10 +822,8 @@ type dataForTmpl struct {
 	CveID            string
 	Cvsses           string
 	Exploits         []models.Exploit
-	Metasploits      []models.Metasploit
 	Summary          string
 	Mitigation       string
-	PatchURLs        []string
 	Confidences      models.Confidences
 	Cwes             []models.CweDictEntry
 	Alerts           []models.Alert
@@ -895,8 +852,14 @@ func detailLines() (string, error) {

 	vinfo := vinfos[currentVinfo]
 	links := []string{}
-	for _, r := range vinfo.CveContents.PrimarySrcURLs(config.Conf.Lang, r.Family, vinfo.CveID) {
-		links = append(links, r.Value)
+	if strings.HasPrefix(vinfo.CveID, "CVE-") {
+		links = append(links, vinfo.CveContents.SourceLinks(
+			config.Conf.Lang, r.Family, vinfo.CveID)[0].Value,
+			vinfo.Cvss2CalcURL(),
+			vinfo.Cvss3CalcURL())
+	}
+	for _, url := range vinfo.VendorLinks(r.Family) {
+		links = append(links, url)
 	}

 	refsMap := map[string]models.Reference{}
@@ -919,20 +882,7 @@ func detailLines() (string, error) {
 	}

 	summary := vinfo.Summaries(r.Lang, r.Family)[0]
-
-	mitigations := []string{}
-	for _, m := range vinfo.Mitigations {
-		switch m.CveContentType {
-		case models.RedHatAPI, models.Microsoft:
-			mitigations = append(mitigations,
-				fmt.Sprintf("%s (%s)", m.Mitigation, m.CveContentType))
-		case models.Nvd:
-			mitigations = append(mitigations,
-				fmt.Sprintf("* %s (%s)", m.URL, m.CveContentType))
-		default:
-			util.Log.Errorf("Unknown CveContentType: %s", m)
-		}
-	}
+	mitigation := vinfo.Mitigations(r.Family)[0]

 	table := uitable.New()
 	table.MaxColWidth = maxColWidth
@@ -970,8 +920,7 @@ func detailLines() (string, error) {
 		CveID:       vinfo.CveID,
 		Cvsses:      fmt.Sprintf("%s\n", table),
 		Summary:     fmt.Sprintf("%s (%s)", summary.Value, summary.Type),
-		Mitigation:  strings.Join(mitigations, "\n"),
-		PatchURLs:   vinfo.CveContents.PatchURLs(),
+		Mitigation:  fmt.Sprintf("%s (%s)", mitigation.Value, mitigation.Type),
 		Confidences: vinfo.Confidences,
 		Cwes:        cwes,
 		Links:       util.Distinct(links),
@@ -1000,18 +949,13 @@ Summary

 Mitigation
 -----------
-{{.Mitigation }}
+ {{.Mitigation }}

-Primary Src
+Links
 -----------
 {{range $link := .Links -}}
 * {{$link}}
 {{end}}
-Patch
-----------
-{{range $url := .PatchURLs -}}
-* {{$url}}
-{{end}}
 CWE
 -----------
 {{range .Cwes -}}
--- a/report/util.go
+++ b/report/util.go
@@ -2,7 +2,6 @@ package report

 import (
 	"bytes"
-	"encoding/csv"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -22,11 +21,7 @@ import (
 	"golang.org/x/xerrors"
 )

-const (
-	vulsOpenTag  = "<vulsreport>"
-	vulsCloseTag = "</vulsreport>"
-	maxColWidth  = 100
-)
+const maxColWidth = 100

 func formatScanSummary(rs ...models.ScanResult) string {
 	table := uitable.New()
@@ -76,7 +71,6 @@ func formatOneLineSummary(rs ...models.ScanResult) string {
 				r.ScannedCves.FormatFixedStatus(r.Packages),
 				r.FormatUpdatablePacksSummary(),
 				r.FormatExploitCveSummary(),
-				r.FormatMetasploitCveSummary(),
 				r.FormatAlertSummary(),
 			}
 		} else {
@@ -102,7 +96,7 @@ func formatOneLineSummary(rs ...models.ScanResult) string {
 }

 func formatList(r models.ScanResult) string {
-	header := r.FormatTextReportHeader()
+	header := r.FormatTextReportHeadedr()
 	if len(r.Errors) != 0 {
 		return fmt.Sprintf(
 			"%s\nError: Use configtest subcommand or scan with --debug to view the details\n%s\n\n",
@@ -132,7 +126,7 @@ No CVE-IDs are found in updatable packages.
 		// packname += strings.Join(vinfo.CpeURIs, ", ")

 		exploits := ""
-		if 0 < len(vinfo.Exploits) || 0 < len(vinfo.Metasploits) {
+		if 0 < len(vinfo.Exploits) {
 			exploits = "POC"
 		}

@@ -140,7 +134,7 @@ No CVE-IDs are found in updatable packages.
 		if strings.HasPrefix(vinfo.CveID, "CVE-") {
 			link = fmt.Sprintf("https://nvd.nist.gov/vuln/detail/%s", vinfo.CveID)
 		} else if strings.HasPrefix(vinfo.CveID, "WPVDBID-") {
-			link = fmt.Sprintf("https://wpscan.com/vulnerabilities/%s", strings.TrimPrefix(vinfo.CveID, "WPVDBID-"))
+			link = fmt.Sprintf("https://wpvulndb.com/vulnerabilities/%s", strings.TrimPrefix(vinfo.CveID, "WPVDBID-"))
 		}

 		data = append(data, []string{
@@ -176,7 +170,7 @@ No CVE-IDs are found in updatable packages.
 }

 func formatFullPlainText(r models.ScanResult) (lines string) {
-	header := r.FormatTextReportHeader()
+	header := r.FormatTextReportHeadedr()
 	if len(r.Errors) != 0 {
 		return fmt.Sprintf(
 			"%s\nError: Use configtest subcommand or scan with --debug to view the details\n%s\n\n",
@@ -217,91 +211,9 @@ No CVE-IDs are found in updatable packages.
 		data = append(data, []string{"Summary", vuln.Summaries(
 			config.Conf.Lang, r.Family)[0].Value})

-		for _, m := range vuln.Mitigations {
-			data = append(data, []string{"Mitigation", m.URL})
-		}
-
-		links := vuln.CveContents.PrimarySrcURLs(
-			config.Conf.Lang, r.Family, vuln.CveID)
-		for _, link := range links {
-			data = append(data, []string{"Primary Src", link.Value})
-		}
-
-		for _, url := range vuln.CveContents.PatchURLs() {
-			data = append(data, []string{"Patch", url})
-		}
-
-		vuln.AffectedPackages.Sort()
-		for _, affected := range vuln.AffectedPackages {
-			if pack, ok := r.Packages[affected.Name]; ok {
-				var line string
-				if pack.Repository != "" {
-					line = fmt.Sprintf("%s (%s)",
-						pack.FormatVersionFromTo(affected),
-						pack.Repository)
-				} else {
-					line = pack.FormatVersionFromTo(affected)
-				}
-				data = append(data, []string{"Affected Pkg", line})
-
-				if len(pack.AffectedProcs) != 0 {
-					for _, p := range pack.AffectedProcs {
-						if len(p.ListenPortStats) == 0 {
-							data = append(data, []string{"",
-								fmt.Sprintf("  - PID: %s %s, Port: []", p.PID, p.Name)})
-						}
-
-						var ports []string
-						for _, pp := range p.ListenPortStats {
-							if len(pp.PortReachableTo) == 0 {
-								ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port))
-							} else {
-								ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo))
-							}
-						}
-
-						data = append(data, []string{"",
-							fmt.Sprintf("  - PID: %s %s, Port: %s", p.PID, p.Name, ports)})
-					}
-				}
-			}
-		}
-		sort.Strings(vuln.CpeURIs)
-		for _, name := range vuln.CpeURIs {
-			data = append(data, []string{"CPE", name})
-		}
-
-		for _, alert := range vuln.GitHubSecurityAlerts {
-			data = append(data, []string{"GitHub", alert.PackageName})
-		}
-
-		for _, wp := range vuln.WpPackageFixStats {
-			if p, ok := r.WordPressPackages.Find(wp.Name); ok {
-				if p.Type == models.WPCore {
-					data = append(data, []string{"WordPress",
-						fmt.Sprintf("%s-%s, FixedIn: %s", wp.Name, p.Version, wp.FixedIn)})
-				} else {
-					data = append(data, []string{"WordPress",
-						fmt.Sprintf("%s-%s, Update: %s, FixedIn: %s, %s",
-							wp.Name, p.Version, p.Update, wp.FixedIn, p.Status)})
-				}
-			} else {
-				data = append(data, []string{"WordPress",
-					fmt.Sprintf("%s", wp.Name)})
-			}
-		}
-
-		for _, l := range vuln.LibraryFixedIns {
-			libs := r.LibraryScanners.Find(l.Path, l.Name)
-			for path, lib := range libs {
-				data = append(data, []string{l.Key,
-					fmt.Sprintf("%s-%s, FixedIn: %s (%s)",
-						lib.Name, lib.Version, l.FixedIn, path)})
-			}
-		}
-
-		for _, confidence := range vuln.Confidences {
-			data = append(data, []string{"Confidence", confidence.String()})
+		mitigation := vuln.Mitigations(r.Family)[0]
+		if mitigation.Type != models.Unknown {
+			data = append(data, []string{"Mitigation", mitigation.Value})
 		}

 		cweURLs, top10URLs := []string{}, []string{}
@@ -333,6 +245,82 @@ No CVE-IDs are found in updatable packages.
 			cweURLs = append(cweURLs, url)
 		}

+		vuln.AffectedPackages.Sort()
+		for _, affected := range vuln.AffectedPackages {
+			if pack, ok := r.Packages[affected.Name]; ok {
+				var line string
+				if pack.Repository != "" {
+					line = fmt.Sprintf("%s (%s)",
+						pack.FormatVersionFromTo(affected),
+						pack.Repository)
+				} else {
+					line = pack.FormatVersionFromTo(affected)
+				}
+				data = append(data, []string{"Affected Pkg", line})
+
+				if len(pack.AffectedProcs) != 0 {
+					for _, p := range pack.AffectedProcs {
+						data = append(data, []string{"",
+							fmt.Sprintf("  - PID: %s %s, Port: %s", p.PID, p.Name, p.ListenPorts)})
+					}
+				}
+			}
+		}
+		sort.Strings(vuln.CpeURIs)
+		for _, name := range vuln.CpeURIs {
+			data = append(data, []string{"CPE", name})
+		}
+
+		for _, alert := range vuln.GitHubSecurityAlerts {
+			data = append(data, []string{"GitHub", alert.PackageName})
+		}
+
+		for _, wp := range vuln.WpPackageFixStats {
+			if p, ok := r.WordPressPackages.Find(wp.Name); ok {
+				if p.Type == models.WPCore {
+					data = append(data, []string{"WordPress",
+						fmt.Sprintf("%s-%s, FixedIn: %s", wp.Name, p.Version, wp.FixedIn)})
+				} else {
+					data = append(data, []string{"WordPress",
+						fmt.Sprintf("%s-%s, Update: %s, FixedIn: %s, %s",
+							wp.Name, p.Version, p.Update, wp.FixedIn, p.Status)})
+				}
+			} else {
+				data = append(data, []string{"WordPress",
+					fmt.Sprintf("%s", wp.Name)})
+			}
+		}
+
+		for _, l := range vuln.LibraryFixedIns {
+			libs := r.LibraryScanners.Find(l.Name)
+			for path, lib := range libs {
+				data = append(data, []string{l.Key,
+					fmt.Sprintf("%s-%s, FixedIn: %s (%s)",
+						lib.Name, lib.Version, l.FixedIn, path)})
+			}
+		}
+
+		for _, confidence := range vuln.Confidences {
+			data = append(data, []string{"Confidence", confidence.String()})
+		}
+
+		if strings.HasPrefix(vuln.CveID, "CVE-") {
+			links := vuln.CveContents.SourceLinks(
+				config.Conf.Lang, r.Family, vuln.CveID)
+			data = append(data, []string{"Source", links[0].Value})
+
+			if 0 < len(vuln.Cvss2Scores(r.Family)) {
+				data = append(data, []string{"CVSSv2 Calc", vuln.Cvss2CalcURL()})
+			}
+			if 0 < len(vuln.Cvss3Scores()) {
+				data = append(data, []string{"CVSSv3 Calc", vuln.Cvss3CalcURL()})
+			}
+		}
+
+		vlinks := vuln.VendorLinks(r.Family)
+		for name, url := range vlinks {
+			data = append(data, []string{name, url})
+		}
 		for _, url := range cweURLs {
 			data = append(data, []string{"CWE", url})
 		}
@@ -379,45 +367,6 @@ No CVE-IDs are found in updatable packages.
 	return
 }

-func formatCsvList(r models.ScanResult, path string) error {
-	data := [][]string{{"CVE-ID", "CVSS", "Attack", "PoC", "CERT", "Fixed", "NVD"}}
-	for _, vinfo := range r.ScannedCves.ToSortedSlice() {
-		max := vinfo.MaxCvssScore().Value.Score
-
-		exploits := ""
-		if 0 < len(vinfo.Exploits) || 0 < len(vinfo.Metasploits) {
-			exploits = "POC"
-		}
-
-		link := ""
-		if strings.HasPrefix(vinfo.CveID, "CVE-") {
-			link = fmt.Sprintf("https://nvd.nist.gov/vuln/detail/%s", vinfo.CveID)
-		} else if strings.HasPrefix(vinfo.CveID, "WPVDBID-") {
-			link = fmt.Sprintf("https://wpscan.com/vulnerabilities/%s", strings.TrimPrefix(vinfo.CveID, "WPVDBID-"))
-		}
-
-		data = append(data, []string{
-			vinfo.CveID,
-			fmt.Sprintf("%4.1f", max),
-			vinfo.AttackVector(),
-			exploits,
-			vinfo.AlertDict.FormatSource(),
-			vinfo.PatchStatus(r.Packages),
-			link,
-		})
-	}
-
-	file, err := os.Create(path)
-	if err != nil {
-		return xerrors.Errorf("Failed to create a file: %s, err: %w", path, err)
-	}
-	defer file.Close()
-	if err := csv.NewWriter(file).WriteAll(data); err != nil {
-		return xerrors.Errorf("Failed to write to file: %s, err: %w", path, err)
-	}
-	return nil
-}
-
 func cweURL(cweID string) string {
 	return fmt.Sprintf("https://cwe.mitre.org/data/definitions/%s.html",
 		strings.TrimPrefix(cweID, "CWE-"))
@@ -438,23 +387,15 @@ func formatChangelogs(r models.ScanResult) string {
 	}
 	return strings.Join(buf, "\n")
 }
-
-func reuseScannedCves(r *models.ScanResult) bool {
+func ovalSupported(r *models.ScanResult) bool {
 	switch r.Family {
 	case
+		config.Amazon,
 		config.FreeBSD,
 		config.Raspbian:
-		return true
+		return false
 	}
-	if isTrivyResult(r) {
-		return true
-	}
-	return false
-}
-
-func isTrivyResult(r *models.ScanResult) bool {
-	_, ok := r.Optional["trivy-target"]
-	return ok
+	return true
 }

 func needToRefreshCve(r models.ScanResult) bool {
@@ -558,9 +499,9 @@ func getDiffCves(previous, current models.ScanResult) models.VulnInfos {
 				updated[v.CveID] = v
 				util.Log.Debugf("updated: %s", v.CveID)

-				// TODO commented out because  a bug of diff logic when multiple oval defs found for a certain CVE-ID and same updated_at
+				// TODO commented out beause  a bug of diff logic when multiple oval defs found for a certain CVE-ID and same updated_at
 				// if these OVAL defs have different affected packages, this logic detects as updated.
-				// This logic will be uncomented after integration with gost https://github.com/knqyf263/gost
+				// This logic will be uncommented after integration with ghost https://github.com/knqyf263/gost
 				// } else if isCveFixed(v, previous) {
 				// updated[v.CveID] = v
 				// util.Log.Debugf("fixed: %s", v.CveID)
@@ -574,10 +515,6 @@ func getDiffCves(previous, current models.ScanResult) models.VulnInfos {
 		}
 	}

-	if len(updated) == 0 {
-		util.Log.Infof("%s: There are %d vulnerabilities, but no difference between current result and previous one.", current.FormatServerName(), len(current.ScannedCves))
-	}
-
 	for cveID, vuln := range new {
 		updated[cveID] = vuln
 	}
@@ -601,7 +538,7 @@ func isCveFixed(current models.VulnInfo, previous models.ScanResult) bool {

 func isCveInfoUpdated(cveID string, previous, current models.ScanResult) bool {
 	cTypes := []models.CveContentType{
-		models.Nvd,
+		models.NvdXML,
 		models.Jvn,
 		models.NewCveContentType(current.Family),
 	}
--- a/report/util_test.go
+++ b/report/util_test.go
@@ -42,7 +42,7 @@ func TestIsCveInfoUpdated(t *testing.T) {
 							CveID: "CVE-2017-0001",
 							CveContents: models.NewCveContents(
 								models.CveContent{
-									Type:         models.Nvd,
+									Type:         models.NvdXML,
 									CveID:        "CVE-2017-0001",
 									LastModified: time.Time{},
 								},
@@ -56,7 +56,7 @@ func TestIsCveInfoUpdated(t *testing.T) {
 							CveID: "CVE-2017-0001",
 							CveContents: models.NewCveContents(
 								models.CveContent{
-									Type:         models.Nvd,
+									Type:         models.NvdXML,
 									CveID:        "CVE-2017-0001",
 									LastModified: time.Time{},
 								},
@@ -113,7 +113,7 @@ func TestIsCveInfoUpdated(t *testing.T) {
 							CveID: "CVE-2017-0003",
 							CveContents: models.NewCveContents(
 								models.CveContent{
-									Type:         models.Nvd,
+									Type:         models.NvdXML,
 									CveID:        "CVE-2017-0002",
 									LastModified: new,
 								},
@@ -128,7 +128,7 @@ func TestIsCveInfoUpdated(t *testing.T) {
 							CveID: "CVE-2017-0003",
 							CveContents: models.NewCveContents(
 								models.CveContent{
-									Type:         models.Nvd,
+									Type:         models.NvdXML,
 									CveID:        "CVE-2017-0002",
 									LastModified: old,
 								},
@@ -150,7 +150,7 @@ func TestIsCveInfoUpdated(t *testing.T) {
 							CveID: "CVE-2017-0004",
 							CveContents: models.NewCveContents(
 								models.CveContent{
-									Type:         models.Nvd,
+									Type:         models.NvdXML,
 									CveID:        "CVE-2017-0002",
 									LastModified: old,
 								},
@@ -356,7 +356,7 @@ func TestIsCveFixed(t *testing.T) {
 					},
 					CveContents: models.NewCveContents(
 						models.CveContent{
-							Type:         models.Nvd,
+							Type:         models.NvdXML,
 							CveID:        "CVE-2016-6662",
 							LastModified: time.Time{},
 						},
@@ -374,7 +374,7 @@ func TestIsCveFixed(t *testing.T) {
 							},
 							CveContents: models.NewCveContents(
 								models.CveContent{
-									Type:         models.Nvd,
+									Type:         models.NvdXML,
 									CveID:        "CVE-2016-6662",
 									LastModified: time.Time{},
 								},
@@ -397,7 +397,7 @@ func TestIsCveFixed(t *testing.T) {
 					},
 					CveContents: models.NewCveContents(
 						models.CveContent{
-							Type:         models.Nvd,
+							Type:         models.NvdXML,
 							CveID:        "CVE-2016-6662",
 							LastModified: time.Time{},
 						},
@@ -415,7 +415,7 @@ func TestIsCveFixed(t *testing.T) {
 							},
 							CveContents: models.NewCveContents(
 								models.CveContent{
-									Type:         models.Nvd,
+									Type:         models.NvdXML,
 									CveID:        "CVE-2016-6662",
 									LastModified: time.Time{},
 								},
--- a/saas/uuid.go
+++ b/saas/uuid.go
@@ -1,280 +0,0 @@
-package saas
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"reflect"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	c "github.com/future-architect/vuls/config"
-	"github.com/future-architect/vuls/models"
-	"github.com/future-architect/vuls/util"
-	"github.com/hashicorp/go-uuid"
-	"golang.org/x/xerrors"
-)
-
-func renameKeyNameUTC(scannedAt time.Time, uuid string, container models.Container) string {
-	timestr := scannedAt.UTC().Format(time.RFC3339)
-	if len(container.ContainerID) == 0 {
-		return fmt.Sprintf("%s/%s.json", timestr, uuid)
-	}
-	return fmt.Sprintf("%s/%s@%s.json", timestr, container.UUID, uuid)
-}
-
-const reUUID = "[\\da-f]{8}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{12}"
-
-// Scanning with the -containers-only flag at scan time, the UUID of Container Host may not be generated,
-// so check it. Otherwise create a UUID of the Container Host and set it.
-func getOrCreateServerUUID(r models.ScanResult, server c.ServerInfo) (serverUUID string, err error) {
-	if id, ok := server.UUIDs[r.ServerName]; !ok {
-		if serverUUID, err = uuid.GenerateUUID(); err != nil {
-			return "", xerrors.Errorf("Failed to generate UUID: %w", err)
-		}
-	} else {
-		matched, err := regexp.MatchString(reUUID, id)
-		if !matched || err != nil {
-			if serverUUID, err = uuid.GenerateUUID(); err != nil {
-				return "", xerrors.Errorf("Failed to generate UUID: %w", err)
-			}
-		}
-	}
-	return serverUUID, nil
-}
-
-// EnsureUUIDs generate a new UUID of the scan target server if UUID is not assigned yet.
-// And then set the generated UUID to config.toml and scan results.
-func EnsureUUIDs(configPath string, results models.ScanResults) (err error) {
-	// Sort Host->Container
-	sort.Slice(results, func(i, j int) bool {
-		if results[i].ServerName == results[j].ServerName {
-			return results[i].Container.ContainerID < results[j].Container.ContainerID
-		}
-		return results[i].ServerName < results[j].ServerName
-	})
-
-	re := regexp.MustCompile(reUUID)
-	for i, r := range results {
-		server := c.Conf.Servers[r.ServerName]
-		if server.UUIDs == nil {
-			server.UUIDs = map[string]string{}
-		}
-
-		name := ""
-		if r.IsContainer() {
-			name = fmt.Sprintf("%s@%s", r.Container.Name, r.ServerName)
-			serverUUID, err := getOrCreateServerUUID(r, server)
-			if err != nil {
-				return err
-			}
-			if serverUUID != "" {
-				server.UUIDs[r.ServerName] = serverUUID
-			}
-		} else {
-			name = r.ServerName
-		}
-
-		if id, ok := server.UUIDs[name]; ok {
-			ok := re.MatchString(id)
-			if !ok || err != nil {
-				util.Log.Warnf("UUID is invalid. Re-generate UUID %s: %s", id, err)
-			} else {
-				if r.IsContainer() {
-					results[i].Container.UUID = id
-					results[i].ServerUUID = server.UUIDs[r.ServerName]
-				} else {
-					results[i].ServerUUID = id
-				}
-				// continue if the UUID has already assigned and valid
-				continue
-			}
-		}
-
-		// Generate a new UUID and set to config and scan result
-		serverUUID, err := uuid.GenerateUUID()
-		if err != nil {
-			return err
-		}
-		server.UUIDs[name] = serverUUID
-		server = cleanForTOMLEncoding(server, c.Conf.Default)
-		c.Conf.Servers[r.ServerName] = server
-
-		if r.IsContainer() {
-			results[i].Container.UUID = serverUUID
-			results[i].ServerUUID = server.UUIDs[r.ServerName]
-		} else {
-			results[i].ServerUUID = serverUUID
-		}
-	}
-
-	for name, server := range c.Conf.Servers {
-		server = cleanForTOMLEncoding(server, c.Conf.Default)
-		c.Conf.Servers[name] = server
-	}
-
-	email := &c.Conf.EMail
-	if email.SMTPAddr == "" {
-		email = nil
-	}
-
-	slack := &c.Conf.Slack
-	if slack.HookURL == "" {
-		slack = nil
-	}
-
-	cveDict := &c.Conf.CveDict
-	ovalDict := &c.Conf.OvalDict
-	gost := &c.Conf.Gost
-	exploit := &c.Conf.Exploit
-	metasploit := &c.Conf.Metasploit
-	http := &c.Conf.HTTP
-	if http.URL == "" {
-		http = nil
-	}
-
-	syslog := &c.Conf.Syslog
-	if syslog.Host == "" {
-		syslog = nil
-	}
-
-	aws := &c.Conf.AWS
-	if aws.S3Bucket == "" {
-		aws = nil
-	}
-
-	azure := &c.Conf.Azure
-	if azure.AccountName == "" {
-		azure = nil
-	}
-
-	chatWork := &c.Conf.ChatWork
-	if chatWork.APIToken == "" {
-		chatWork = nil
-	}
-
-	saas := &c.Conf.Saas
-	if saas.GroupID == 0 {
-		saas = nil
-	}
-
-	c := struct {
-		CveDict    *c.GoCveDictConf  `toml:"cveDict"`
-		OvalDict   *c.GovalDictConf  `toml:"ovalDict"`
-		Gost       *c.GostConf       `toml:"gost"`
-		Exploit    *c.ExploitConf    `toml:"exploit"`
-		Metasploit *c.MetasploitConf `toml:"metasploit"`
-		Slack      *c.SlackConf      `toml:"slack"`
-		Email      *c.SMTPConf       `toml:"email"`
-		HTTP       *c.HTTPConf       `toml:"http"`
-		Syslog     *c.SyslogConf     `toml:"syslog"`
-		AWS        *c.AWS            `toml:"aws"`
-		Azure      *c.Azure          `toml:"azure"`
-		ChatWork   *c.ChatWorkConf   `toml:"chatWork"`
-		Saas       *c.SaasConf       `toml:"saas"`
-
-		Default c.ServerInfo            `toml:"default"`
-		Servers map[string]c.ServerInfo `toml:"servers"`
-	}{
-		CveDict:    cveDict,
-		OvalDict:   ovalDict,
-		Gost:       gost,
-		Exploit:    exploit,
-		Metasploit: metasploit,
-		Slack:      slack,
-		Email:      email,
-		HTTP:       http,
-		Syslog:     syslog,
-		AWS:        aws,
-		Azure:      azure,
-		ChatWork:   chatWork,
-		Saas:       saas,
-
-		Default: c.Conf.Default,
-		Servers: c.Conf.Servers,
-	}
-
-	// rename the current config.toml to config.toml.bak
-	info, err := os.Lstat(configPath)
-	if err != nil {
-		return xerrors.Errorf("Failed to lstat %s: %w", configPath, err)
-	}
-	realPath := configPath
-	if info.Mode()&os.ModeSymlink == os.ModeSymlink {
-		if realPath, err = os.Readlink(configPath); err != nil {
-			return xerrors.Errorf("Failed to Read link %s: %w", configPath, err)
-		}
-	}
-	if err := os.Rename(realPath, realPath+".bak"); err != nil {
-		return xerrors.Errorf("Failed to rename %s: %w", configPath, err)
-	}
-
-	var buf bytes.Buffer
-	if err := toml.NewEncoder(&buf).Encode(c); err != nil {
-		return xerrors.Errorf("Failed to encode to toml: %w", err)
-	}
-	str := strings.Replace(buf.String(), "\n  [", "\n\n  [", -1)
-	str = fmt.Sprintf("%s\n\n%s",
-		"# See README for details: https://vuls.io/docs/en/usage-settings.html",
-		str)
-
-	return ioutil.WriteFile(realPath, []byte(str), 0600)
-}
-
-func cleanForTOMLEncoding(server c.ServerInfo, def c.ServerInfo) c.ServerInfo {
-	if reflect.DeepEqual(server.Optional, def.Optional) {
-		server.Optional = nil
-	}
-
-	if def.User == server.User {
-		server.User = ""
-	}
-
-	if def.Host == server.Host {
-		server.Host = ""
-	}
-
-	if def.Port == server.Port {
-		server.Port = ""
-	}
-
-	if def.KeyPath == server.KeyPath {
-		server.KeyPath = ""
-	}
-
-	if reflect.DeepEqual(server.ScanMode, def.ScanMode) {
-		server.ScanMode = nil
-	}
-
-	if def.Type == server.Type {
-		server.Type = ""
-	}
-
-	if reflect.DeepEqual(server.CpeNames, def.CpeNames) {
-		server.CpeNames = nil
-	}
-
-	if def.OwaspDCXMLPath == server.OwaspDCXMLPath {
-		server.OwaspDCXMLPath = ""
-	}
-
-	if reflect.DeepEqual(server.IgnoreCves, def.IgnoreCves) {
-		server.IgnoreCves = nil
-	}
-
-	if reflect.DeepEqual(server.Enablerepo, def.Enablerepo) {
-		server.Enablerepo = nil
-	}
-
-	for k, v := range def.Optional {
-		if vv, ok := server.Optional[k]; ok && v == vv {
-			delete(server.Optional, k)
-		}
-	}
-
-	return server
-}
--- a/scan/alpine.go
+++ b/scan/alpine.go
@@ -147,9 +147,6 @@ func (o *alpine) parseApkInfo(stdout string) (models.Packages, error) {
 		line := scanner.Text()
 		ss := strings.Split(line, "-")
 		if len(ss) < 3 {
-			if strings.Contains(ss[0], "WARNING") {
-				continue
-			}
 			return nil, xerrors.Errorf("Failed to parse apk info -v: %s", line)
 		}
 		name := strings.Join(ss[:len(ss)-2], "-")
--- a/scan/base.go
+++ b/scan/base.go
@@ -4,14 +4,13 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net"
-	"os"
 	"regexp"
 	"strings"
 	"time"

 	"github.com/aquasecurity/fanal/analyzer"
+	"github.com/aquasecurity/fanal/extractor"

 	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/models"
@@ -535,7 +534,8 @@ func (l *base) scanLibraries() (err error) {
 		return nil
 	}

-	libFilemap := map[string][]byte{}
+	libFilemap := extractor.FileMap{}
+
 	detectFiles := l.ServerInfo.Lockfiles

 	// auto detect lockfile
@@ -546,8 +546,8 @@ func (l *base) scanLibraries() (err error) {
 		}

 		// delete last "-o "
-		// find / -name "*package-lock.json" -o -name "*yarn.lock" ... 2>&1 | grep -v "find: "
-		cmd := fmt.Sprintf(`find / ` + findopt[:len(findopt)-3] + ` 2>&1 | grep -v "find: "`)
+		// find / -name "*package-lock.json" -o -name "*yarn.lock" ... 2>&1 | grep -v "Permission denied"
+		cmd := fmt.Sprintf(`find / ` + findopt[:len(findopt)-3] + ` 2>&1 | grep -v "Permission denied"`)
 		r := exec(l.ServerInfo, cmd, noSudo)
 		if r.ExitStatus != 0 && r.ExitStatus != 1 {
 			return xerrors.Errorf("Failed to find lock files")
@@ -563,62 +563,25 @@ func (l *base) scanLibraries() (err error) {
 		if _, ok := libFilemap[path]; ok {
 			continue
 		}
-
-		var bytes []byte
-		switch l.Distro.Family {
-		case config.ServerTypePseudo:
-			bytes, err = ioutil.ReadFile(path)
-			if err != nil {
-				return xerrors.Errorf("Failed to get target file: %s, filepath: %s", err, path)
-			}
-		default:
-			cmd := fmt.Sprintf("cat %s", path)
-			r := exec(l.ServerInfo, cmd, noSudo)
-			if !r.isSuccess() {
-				return xerrors.Errorf("Failed to get target file: %s, filepath: %s", r, path)
-			}
-			bytes = []byte(r.Stdout)
+		cmd := fmt.Sprintf("cat %s", path)
+		r := exec(l.ServerInfo, cmd, noSudo)
+		if !r.isSuccess() {
+			return xerrors.Errorf("Failed to get target file: %s, filepath: %s", r, path)
 		}
-		libFilemap[path] = bytes
+		libFilemap[path] = []byte(r.Stdout)
 	}

-	for path, b := range libFilemap {
-		res, err := analyzer.AnalyzeFile(path, &DummyFileInfo{}, func() ([]byte, error) {
-			return b, nil
-		})
-		if err != nil {
-			return xerrors.Errorf("Failed to get libs: %w", err)
-		}
-		libscan, err := convertLibWithScanner(res.Applications)
-		if err != nil {
-			return xerrors.Errorf("Failed to scan libraries: %w", err)
-		}
-		l.LibraryScanners = append(l.LibraryScanners, libscan...)
+	results, err := analyzer.GetLibraries(libFilemap)
+	if err != nil {
+		return xerrors.Errorf("Failed to get libs: %w", err)
+	}
+	l.LibraryScanners, err = convertLibWithScanner(results)
+	if err != nil {
+		return xerrors.Errorf("Failed to scan libraries: %w", err)
 	}
 	return nil
 }

-// DummyFileInfo is a dummy struct for libscan
-type DummyFileInfo struct{}
-
-// Name is
-func (d *DummyFileInfo) Name() string { return "dummy" }
-
-// Size is
-func (d *DummyFileInfo) Size() int64 { return 0 }
-
-// Mode is
-func (d *DummyFileInfo) Mode() os.FileMode { return 0 }
-
-//ModTime is
-func (d *DummyFileInfo) ModTime() time.Time { return time.Now() }
-
-// IsDir is
-func (d *DummyFileInfo) IsDir() bool { return false }
-
-//Sys is
-func (d *DummyFileInfo) Sys() interface{} { return nil }
-
 func (l *base) scanWordPress() (err error) {
 	wpOpts := []string{l.ServerInfo.WordPress.OSUser,
 		l.ServerInfo.WordPress.DocRoot,
@@ -741,117 +704,6 @@ func (l *base) detectWpPlugins() ([]models.WpPackage, error) {
 	return plugins, nil
 }

-func (l *base) scanPorts() (err error) {
-	dest := l.detectScanDest()
-	open, err := l.execPortsScan(dest)
-	if err != nil {
-		return err
-	}
-	l.updatePortStatus(open)
-
-	return nil
-}
-
-func (l *base) detectScanDest() map[string][]string {
-	scanIPPortsMap := map[string][]string{}
-
-	for _, p := range l.osPackages.Packages {
-		if p.AffectedProcs == nil {
-			continue
-		}
-		for _, proc := range p.AffectedProcs {
-			if proc.ListenPortStats == nil {
-				continue
-			}
-			for _, port := range proc.ListenPortStats {
-				scanIPPortsMap[port.BindAddress] = append(scanIPPortsMap[port.BindAddress], port.Port)
-			}
-		}
-	}
-
-	scanDestIPPorts := map[string][]string{}
-	for addr, ports := range scanIPPortsMap {
-		if addr == "*" {
-			for _, addr := range l.ServerInfo.IPv4Addrs {
-				scanDestIPPorts[addr] = append(scanDestIPPorts[addr], ports...)
-			}
-		} else {
-			scanDestIPPorts[addr] = append(scanDestIPPorts[addr], ports...)
-		}
-	}
-
-	uniqScanDestIPPorts := map[string][]string{}
-	for i, scanDest := range scanDestIPPorts {
-		m := map[string]bool{}
-		for _, e := range scanDest {
-			if !m[e] {
-				m[e] = true
-				uniqScanDestIPPorts[i] = append(uniqScanDestIPPorts[i], e)
-			}
-		}
-	}
-
-	return uniqScanDestIPPorts
-}
-
-func (l *base) execPortsScan(scanDestIPPorts map[string][]string) ([]string, error) {
-	listenIPPorts := []string{}
-
-	for ip, ports := range scanDestIPPorts {
-		if !isLocalExec(l.ServerInfo.Port, l.ServerInfo.Host) && net.ParseIP(ip).IsLoopback() {
-			continue
-		}
-		for _, port := range ports {
-			scanDest := ip + ":" + port
-			conn, err := net.DialTimeout("tcp", scanDest, time.Duration(1)*time.Second)
-			if err != nil {
-				continue
-			}
-			conn.Close()
-			listenIPPorts = append(listenIPPorts, scanDest)
-		}
-	}
-
-	return listenIPPorts, nil
-}
-
-func (l *base) updatePortStatus(listenIPPorts []string) {
-	for name, p := range l.osPackages.Packages {
-		if p.AffectedProcs == nil {
-			continue
-		}
-		for i, proc := range p.AffectedProcs {
-			if proc.ListenPortStats == nil {
-				continue
-			}
-			for j, port := range proc.ListenPortStats {
-				l.osPackages.Packages[name].AffectedProcs[i].ListenPortStats[j].PortReachableTo = l.findPortTestSuccessOn(listenIPPorts, port)
-			}
-		}
-	}
-}
-
-func (l *base) findPortTestSuccessOn(listenIPPorts []string, searchListenPort models.PortStat) []string {
-	addrs := []string{}
-
-	for _, ipPort := range listenIPPorts {
-		ipPort, err := models.NewPortStat(ipPort)
-		if err != nil {
-			util.Log.Warnf("Failed to find: %+v", err)
-			continue
-		}
-		if searchListenPort.BindAddress == "*" {
-			if searchListenPort.Port == ipPort.Port {
-				addrs = append(addrs, ipPort.BindAddress)
-			}
-		} else if searchListenPort.BindAddress == ipPort.BindAddress && searchListenPort.Port == ipPort.Port {
-			addrs = append(addrs, ipPort.BindAddress)
-		}
-	}
-
-	return addrs
-}
-
 func (l *base) ps() (stdout string, err error) {
 	cmd := `LANGUAGE=en_US.UTF-8 ps --no-headers --ppid 2 -p 2 --deselect -o pid,comm`
 	r := l.exec(util.PrependProxyEnv(cmd), noSudo)
@@ -914,13 +766,13 @@ func (l *base) lsOfListen() (stdout string, err error) {
 	cmd := `lsof -i -P -n | grep LISTEN`
 	r := l.exec(util.PrependProxyEnv(cmd), sudo)
 	if !r.isSuccess(0, 1) {
-		return "", xerrors.Errorf("Failed to lsof: %s", r)
+		return "", xerrors.Errorf("Failed to SSH: %s", r)
 	}
 	return r.Stdout, nil
 }

-func (l *base) parseLsOf(stdout string) map[string][]string {
-	portPids := map[string][]string{}
+func (l *base) parseLsOf(stdout string) map[string]string {
+	portPid := map[string]string{}
 	scanner := bufio.NewScanner(strings.NewReader(stdout))
 	for scanner.Scan() {
 		ss := strings.Fields(scanner.Text())
@@ -928,7 +780,7 @@ func (l *base) parseLsOf(stdout string) map[string][]string {
 			continue
 		}
 		pid, ipPort := ss[1], ss[8]
-		portPids[ipPort] = util.AppendIfMissing(portPids[ipPort], pid)
+		portPid[ipPort] = pid
 	}
-	return portPids
+	return portPid
 }
--- a/scan/base_test.go
+++ b/scan/base_test.go
@@ -12,7 +12,6 @@ import (
 	_ "github.com/aquasecurity/fanal/analyzer/library/poetry"
 	_ "github.com/aquasecurity/fanal/analyzer/library/yarn"
 	"github.com/future-architect/vuls/config"
-	"github.com/future-architect/vuls/models"
 )

 func TestParseDockerPs(t *testing.T) {
@@ -244,7 +243,7 @@ func Test_base_parseLsOf(t *testing.T) {
 	tests := []struct {
 		name        string
 		args        args
-		wantPortPid map[string][]string
+		wantPortPid map[string]string
 	}{
 		{
 			name: "lsof",
@@ -257,34 +256,13 @@ node       1498          ubuntu   21u  IPv6  20132      0t0  TCP *:35401 (LISTEN
 node       1498          ubuntu   22u  IPv6  20133      0t0  TCP *:44801 (LISTEN)
 docker-pr  9135            root    4u  IPv6 297133      0t0  TCP *:6379 (LISTEN)`,
 			},
-			wantPortPid: map[string][]string{
-				"localhost:53": {"474"},
-				"*:22":         {"644"},
-				"*:3128":       {"959"},
-				"*:35401":      {"1498"},
-				"*:44801":      {"1498"},
-				"*:6379":       {"9135"},
-			},
-		},
-		{
-			name: "lsof-duplicate-port",
-			args: args{
-				stdout: `sshd      832   root    3u  IPv4  15731      0t0  TCP *:22 (LISTEN)
-sshd      832   root    4u  IPv6  15740      0t0  TCP *:22 (LISTEN)
-master   1099   root   13u  IPv4  16657      0t0  TCP 127.0.0.1:25 (LISTEN)
-master   1099   root   14u  IPv6  16658      0t0  TCP [::1]:25 (LISTEN)
-httpd   32250   root    4u  IPv6 334982      0t0  TCP *:80 (LISTEN)
-httpd   32251 apache    4u  IPv6 334982      0t0  TCP *:80 (LISTEN)
-httpd   32252 apache    4u  IPv6 334982      0t0  TCP *:80 (LISTEN)
-httpd   32253 apache    4u  IPv6 334982      0t0  TCP *:80 (LISTEN)
-httpd   32254 apache    4u  IPv6 334982      0t0  TCP *:80 (LISTEN)
-httpd   32255 apache    4u  IPv6 334982      0t0  TCP *:80 (LISTEN)`,
-			},
-			wantPortPid: map[string][]string{
-				"*:22":         {"832"},
-				"127.0.0.1:25": {"1099"},
-				"[::1]:25":     {"1099"},
-				"*:80":         {"32250", "32251", "32252", "32253", "32254", "32255"},
+			wantPortPid: map[string]string{
+				"localhost:53": "474",
+				"*:22":         "644",
+				"*:3128":       "959",
+				"*:35401":      "1498",
+				"*:44801":      "1498",
+				"*:6379":       "9135",
 			},
 		},
 	}
@@ -297,197 +275,3 @@ httpd   32255 apache    4u  IPv6 334982      0t0  TCP *:80 (LISTEN)`,
 		})
 	}
 }
-
-func Test_detectScanDest(t *testing.T) {
-	tests := []struct {
-		name   string
-		args   base
-		expect map[string][]string
-	}{
-		{
-			name: "empty",
-			args: base{osPackages: osPackages{
-				Packages: models.Packages{"curl": models.Package{
-					Name:       "curl",
-					Version:    "7.64.0-4+deb10u1",
-					NewVersion: "7.64.0-4+deb10u1",
-				}},
-			}},
-			expect: map[string][]string{},
-		},
-		{
-			name: "single-addr",
-			args: base{osPackages: osPackages{
-				Packages: models.Packages{"libaudit1": models.Package{
-					Name:       "libaudit1",
-					Version:    "1:2.8.4-3",
-					NewVersion: "1:2.8.4-3",
-					AffectedProcs: []models.AffectedProcess{
-						{PID: "21", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}}}, {PID: "10876", Name: "sshd"}},
-				},
-				}},
-			},
-			expect: map[string][]string{"127.0.0.1": {"22"}},
-		},
-		{
-			name: "dup-addr-port",
-			args: base{osPackages: osPackages{
-				Packages: models.Packages{"libaudit1": models.Package{
-					Name:       "libaudit1",
-					Version:    "1:2.8.4-3",
-					NewVersion: "1:2.8.4-3",
-					AffectedProcs: []models.AffectedProcess{
-						{PID: "21", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}}}, {PID: "21", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}}}},
-				},
-				}},
-			},
-			expect: map[string][]string{"127.0.0.1": {"22"}},
-		},
-		{
-			name: "multi-addr",
-			args: base{osPackages: osPackages{
-				Packages: models.Packages{"libaudit1": models.Package{
-					Name:       "libaudit1",
-					Version:    "1:2.8.4-3",
-					NewVersion: "1:2.8.4-3",
-					AffectedProcs: []models.AffectedProcess{
-						{PID: "21", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}}}, {PID: "21", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "192.168.1.1", Port: "22"}}}, {PID: "6261", Name: "nginx", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "80"}}}},
-				},
-				}},
-			},
-			expect: map[string][]string{"127.0.0.1": {"22", "80"}, "192.168.1.1": {"22"}},
-		},
-		{
-			name: "asterisk",
-			args: base{
-				osPackages: osPackages{
-					Packages: models.Packages{"libaudit1": models.Package{
-						Name:       "libaudit1",
-						Version:    "1:2.8.4-3",
-						NewVersion: "1:2.8.4-3",
-						AffectedProcs: []models.AffectedProcess{
-							{PID: "21", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "*", Port: "22"}}}},
-					},
-					}},
-				ServerInfo: config.ServerInfo{
-					IPv4Addrs: []string{"127.0.0.1", "192.168.1.1"},
-				},
-			},
-			expect: map[string][]string{"127.0.0.1": {"22"}, "192.168.1.1": {"22"}},
-		}}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if dest := tt.args.detectScanDest(); !reflect.DeepEqual(dest, tt.expect) {
-				t.Errorf("base.detectScanDest() = %v, want %v", dest, tt.expect)
-			}
-		})
-	}
-}
-
-func Test_updatePortStatus(t *testing.T) {
-	type args struct {
-		l             base
-		listenIPPorts []string
-	}
-	tests := []struct {
-		name   string
-		args   args
-		expect models.Packages
-	}{
-		{name: "nil_affected_procs",
-			args: args{
-				l: base{osPackages: osPackages{
-					Packages: models.Packages{"libc-bin": models.Package{Name: "libc-bin"}},
-				}},
-				listenIPPorts: []string{"127.0.0.1:22"}},
-			expect: models.Packages{"libc-bin": models.Package{Name: "libc-bin"}}},
-		{name: "nil_listen_ports",
-			args: args{
-				l: base{osPackages: osPackages{
-					Packages: models.Packages{"bash": models.Package{Name: "bash", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}}}},
-				}},
-				listenIPPorts: []string{"127.0.0.1:22"}},
-			expect: models.Packages{"bash": models.Package{Name: "bash", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}}}}},
-		{name: "update_match_single_address",
-			args: args{
-				l: base{osPackages: osPackages{
-					Packages: models.Packages{"libc6": models.Package{Name: "libc6", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}, {PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}}}}}},
-				}},
-				listenIPPorts: []string{"127.0.0.1:22"}},
-			expect: models.Packages{"libc6": models.Package{Name: "libc6", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}, {PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22", PortReachableTo: []string{"127.0.0.1"}}}}}}}},
-		{name: "update_match_multi_address",
-			args: args{
-				l: base{osPackages: osPackages{
-					Packages: models.Packages{"libc6": models.Package{Name: "libc6", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}, {PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}, {BindAddress: "192.168.1.1", Port: "22"}}}}}},
-				}},
-				listenIPPorts: []string{"127.0.0.1:22", "192.168.1.1:22"}},
-			expect: models.Packages{"libc6": models.Package{Name: "libc6", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}, {PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{
-				{BindAddress: "127.0.0.1", Port: "22", PortReachableTo: []string{"127.0.0.1"}},
-				{BindAddress: "192.168.1.1", Port: "22", PortReachableTo: []string{"192.168.1.1"}},
-			}}}}}},
-		{name: "update_match_asterisk",
-			args: args{
-				l: base{osPackages: osPackages{
-					Packages: models.Packages{"libc6": models.Package{Name: "libc6", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}, {PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "*", Port: "22"}}}}}},
-				}},
-				listenIPPorts: []string{"127.0.0.1:22", "127.0.0.1:80", "192.168.1.1:22"}},
-			expect: models.Packages{"libc6": models.Package{Name: "libc6", AffectedProcs: []models.AffectedProcess{{PID: "1", Name: "bash"}, {PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{
-				{BindAddress: "*", Port: "22", PortReachableTo: []string{"127.0.0.1", "192.168.1.1"}},
-			}}}}}},
-		{name: "update_multi_packages",
-			args: args{
-				l: base{osPackages: osPackages{
-					Packages: models.Packages{
-						"packa": models.Package{Name: "packa", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "80"}}}}},
-						"packb": models.Package{Name: "packb", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}}}}},
-						"packc": models.Package{Name: "packc", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22"}, {BindAddress: "192.168.1.1", Port: "22"}}}}},
-						"packd": models.Package{Name: "packd", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "*", Port: "22"}}}}},
-					},
-				}},
-				listenIPPorts: []string{"127.0.0.1:22", "192.168.1.1:22"}},
-			expect: models.Packages{
-				"packa": models.Package{Name: "packa", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "80", PortReachableTo: []string{}}}}}},
-				"packb": models.Package{Name: "packb", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22", PortReachableTo: []string{"127.0.0.1"}}}}}},
-				"packc": models.Package{Name: "packc", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "127.0.0.1", Port: "22", PortReachableTo: []string{"127.0.0.1"}}, {BindAddress: "192.168.1.1", Port: "22", PortReachableTo: []string{"192.168.1.1"}}}}}},
-				"packd": models.Package{Name: "packd", AffectedProcs: []models.AffectedProcess{{PID: "75", Name: "sshd", ListenPortStats: []models.PortStat{{BindAddress: "*", Port: "22", PortReachableTo: []string{"127.0.0.1", "192.168.1.1"}}}}}},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.args.l.updatePortStatus(tt.args.listenIPPorts)
-			if !reflect.DeepEqual(tt.args.l.osPackages.Packages, tt.expect) {
-				t.Errorf("l.updatePortStatus() = %v, want %v", tt.args.l.osPackages.Packages, tt.expect)
-			}
-		})
-	}
-}
-
-func Test_matchListenPorts(t *testing.T) {
-	type args struct {
-		listenIPPorts    []string
-		searchListenPort models.PortStat
-	}
-	tests := []struct {
-		name   string
-		args   args
-		expect []string
-	}{
-		{name: "open_empty", args: args{listenIPPorts: []string{}, searchListenPort: models.PortStat{BindAddress: "127.0.0.1", Port: "22"}}, expect: []string{}},
-		{name: "port_empty", args: args{listenIPPorts: []string{"127.0.0.1:22"}, searchListenPort: models.PortStat{}}, expect: []string{}},
-		{name: "single_match", args: args{listenIPPorts: []string{"127.0.0.1:22"}, searchListenPort: models.PortStat{BindAddress: "127.0.0.1", Port: "22"}}, expect: []string{"127.0.0.1"}},
-		{name: "no_match_address", args: args{listenIPPorts: []string{"127.0.0.1:22"}, searchListenPort: models.PortStat{BindAddress: "192.168.1.1", Port: "22"}}, expect: []string{}},
-		{name: "no_match_port", args: args{listenIPPorts: []string{"127.0.0.1:22"}, searchListenPort: models.PortStat{BindAddress: "127.0.0.1", Port: "80"}}, expect: []string{}},
-		{name: "asterisk_match", args: args{listenIPPorts: []string{"127.0.0.1:22", "127.0.0.1:80", "192.168.1.1:22"}, searchListenPort: models.PortStat{BindAddress: "*", Port: "22"}}, expect: []string{"127.0.0.1", "192.168.1.1"}},
-	}
-
-	l := base{}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if match := l.findPortTestSuccessOn(tt.args.listenIPPorts, tt.args.searchListenPort); !reflect.DeepEqual(match, tt.expect) {
-				t.Errorf("findPortTestSuccessOn() = %v, want %v", match, tt.expect)
-			}
-		})
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sadayuki Matsuno	1e2a299c0f	delete 32 bit releaser	2020-06-05 14:37:37 +09:00
Sadayuki Matsuno	0e0f946f5c	add 32 bit releaser and add exit code in cmd	2020-06-05 14:30:08 +09:00
Sadayuki Matsuno	621fa8a01f	fix releaser	2020-05-29 18:38:22 +09:00
Sadayuki Matsuno	1ac0750722	fix releaser	2020-05-29 18:31:25 +09:00
Sadayuki Matsuno	5e37ec8edd	fix releaser	2020-05-29 18:24:15 +09:00
Sadayuki Matsuno	a6009c466c	fix releaser	2020-05-29 18:13:07 +09:00