diff --git a/analyzers/VirusTotal/VirusTotal_DownloadSample.json b/analyzers/VirusTotal/VirusTotal_DownloadSample.json
index 3f3ab4321..b598f5150 100644
--- a/analyzers/VirusTotal/VirusTotal_DownloadSample.json
+++ b/analyzers/VirusTotal/VirusTotal_DownloadSample.json
@@ -1,6 +1,6 @@
 {
   "name": "VirusTotal_DownloadSample",
-  "version": "3.0",
+  "version": "3.1",
   "author": "LDO-CERT",
   "url": "https://github.com/TheHive-Project/Cortex-Analyzers",
   "license": "AGPL-V3",
diff --git a/analyzers/VirusTotal/VirusTotal_GetReport.json b/analyzers/VirusTotal/VirusTotal_GetReport.json
index 91b7cc299..ad4ab2bb2 100644
--- a/analyzers/VirusTotal/VirusTotal_GetReport.json
+++ b/analyzers/VirusTotal/VirusTotal_GetReport.json
@@ -1,6 +1,6 @@
 {
   "name": "VirusTotal_GetReport",
-  "version": "3.0",
+  "version": "3.1",
   "author": "CERT-BDF",
   "url": "https://github.com/TheHive-Project/Cortex-Analyzers",
   "license": "AGPL-V3",
diff --git a/analyzers/VirusTotal/VirusTotal_Rescan.json b/analyzers/VirusTotal/VirusTotal_Rescan.json
index 0e07ecbd2..82a4ced16 100644
--- a/analyzers/VirusTotal/VirusTotal_Rescan.json
+++ b/analyzers/VirusTotal/VirusTotal_Rescan.json
@@ -1,6 +1,6 @@
 {
   "name": "VirusTotal_Rescan",
-  "version": "3.0",
+  "version": "3.1",
   "author": "CERT-LDO",
   "url": "https://github.com/TheHive-Project/Cortex-Analyzers",
   "license": "AGPL-V3",
diff --git a/analyzers/VirusTotal/VirusTotal_Scan.json b/analyzers/VirusTotal/VirusTotal_Scan.json
index bbfda7307..c923e2145 100644
--- a/analyzers/VirusTotal/VirusTotal_Scan.json
+++ b/analyzers/VirusTotal/VirusTotal_Scan.json
@@ -1,6 +1,6 @@
 {
   "name": "VirusTotal_Scan",
-  "version": "3.0",
+  "version": "3.1",
   "author": "CERT-BDF",
   "url": "https://github.com/TheHive-Project/Cortex-Analyzers",
   "license": "AGPL-V3",
diff --git a/analyzers/VirusTotal/requirements.txt b/analyzers/VirusTotal/requirements.txt
index 3acdae127..6a1612f9c 100644
--- a/analyzers/VirusTotal/requirements.txt
+++ b/analyzers/VirusTotal/requirements.txt
@@ -1,6 +1,6 @@
 cortexutils
 future
 requests
-virustotal-api
+vt-py
 python-magic
 filetype
diff --git a/analyzers/VirusTotal/virustotal.py b/analyzers/VirusTotal/virustotal.py
index 6f8824e52..8635e1dcf 100755
--- a/analyzers/VirusTotal/virustotal.py
+++ b/analyzers/VirusTotal/virustotal.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # encoding: utf-8
 
+# report -> domain
+
 import os
 import time
 import hashlib
@@ -8,10 +10,14 @@
 import tempfile
 import mimetypes
 import filetype
+import json
+import urllib
+import urllib.parse
 
 from datetime import datetime
-from virus_total_apis import PublicApi, PrivateApi
+from vt import Client, error
 from cortexutils.analyzer import Analyzer
+from base64 import urlsafe_b64encode, b64decode
 
 
 class VirusTotalAnalyzer(Analyzer):
@@ -36,103 +42,53 @@ def __init__(self):
         )
         self.obs_path = None
         self.proxies = self.get_param("config.proxy", None)
-        if (
-            self.download_sample
-            or self.download_sample_if_highlighted
-            or self.service == "download"
-        ):
-            self.vt_pay = PrivateApi(self.virustotal_key, self.proxies)
-        self.vt = PublicApi(self.virustotal_key, self.proxies)
+        self.vt = Client(apikey=self.virustotal_key, proxy=self.proxies)
 
     def get_file(self, hash):
         self.obs_path = "{}/{}".format(tempfile.gettempdir(), hash)
-        response = self.vt_pay.get_file(hash)
-        if response.get("response_code", None) == 200:
-            with open(self.obs_path, "wb") as f:
-                f.write(response["results"])
-            kind = filetype.guess(self.obs_path)
-            if kind and kind.extension != None:
-                os.rename(self.obs_path, "{}.{}".format(self.obs_path, kind.extension))
-                self.obs_path = "{}.{}".format(self.obs_path, kind.extension)
-
-    def wait_file_report(self, id):
-        results = self.check_response(self.vt.get_file_report(id))
-        code = results.get("response_code", None)
-        if code == 1:
-            if self.data_type == "hash" and (
-                self.download_sample
-                or (
-                    self.download_sample_if_highlighted
-                    and self.highlighted_antivirus
-                    and any(
-                        [
-                            results.get("scans", {}).get(av, {}).get("detected", None)
-                            == False
-                            for av in self.highlighted_antivirus
-                        ]
-                    )
-                )
-            ):
-                self.get_file(self.get_param("data", None, "Data is missing"))
-            self.report(results)
-        else:
-            time.sleep(self.polling_interval)
-            self.wait_file_report(id)
-
-    def wait_url_report(self, id):
-        results = self.check_response(self.vt.get_url_report(id))
-        code = results.get("response_code", None)
-        if code == 1 and (results.get("scan_id") == id):
-            self.report(results)
-        else:
-            time.sleep(self.polling_interval)
-            self.wait_url_report(id)
-
-    def check_response(self, response):
-        if type(response) is not dict:
-            self.error("Bad response : " + str(response))
-        status = response.get("response_code", -1)
-        if status == 204:
-            self.error("VirusTotal api rate limit exceeded (Status 204).")
-        if status != 200:
-            self.error("Bad status : " + str(status))
-        results = response.get("results", {})
-        if "Missing IP address" in results.get("verbose_msg", ""):
-            results["verbose_msg"] = "IP address not available in VirusTotal"
-        return results
-
-        # 0 => not found
-        # -2 => in queue
-        # 1 => ready
-
-    def read_scan_response(self, response, func):
-        results = self.check_response(response)
-        code = results.get("response_code", None)
-        scan_id = results.get("scan_id", None)
-        if code == 1 and scan_id is not None:
-            func(scan_id)
-        else:
-            self.error("Scan not found")
+        with open(self.obs_path, "wb") as obs_file:
+            self.vt.download_file(hash, obs_file)
+
+    def file_to_sha256(self, file):
+        sha256_hash = hashlib.sha256()
+        for byte_block in iter(lambda: file.read(4096), b""):
+            sha256_hash.update(byte_block)
+        return sha256_hash.hexdigest()
 
     def artifacts(self, raw):
         artifacts = []
+
         if self.obs_path:
-            tags = []
-            # This will work only in scan/rescan workflow, not in download only
+            tags = ["autoImport:true"]
+            # This will work only in scan/rescan workflow, not in download
             if self.highlighted_antivirus:
                 for av in self.highlighted_antivirus:
-                    detected = raw.get("scans", {}).get(av, {}).get("detected", None)
-                    if detected == False:
+                    category = (
+                        raw["attributes"]
+                        .get("last_analysis_results", {})
+                        .get(av, {})
+                        .get("category", None)
+                    )
+                    if category != "malicious" or category != "suspicious":
                         tags.append("to_{}".format(av))
             artifacts.append(self.build_artifact("file", self.obs_path, tags=tags))
+
+        for ioc_type in raw.get("iocs", []):
+            for ioc in raw.get("iocs").get(ioc_type):
+                artifacts.append(self.build_artifact(ioc_type, ioc.get("data"), tags=ioc.get("tags")))
+
         return artifacts
 
     def summary(self, raw):
         taxonomies = []
-        level = "info"
         namespace = "VT"
         predicate = "GetReport"
-        value = "0"
+        stats_field = "last_analysis_stats"
+        results_field = "last_analysis_results"
+
+        if self.service == "scan" or self.service == "rescan":
+            stats_field = "stats"
+            results_field = "results"
 
         if self.service == "scan":
             predicate = "Scan"
@@ -143,68 +99,128 @@ def summary(self, raw):
 
         result = {"has_result": True}
 
-        if raw["response_code"] != 1:
+        if "id" not in raw:
             result["has_result"] = False
 
-        result["positives"] = raw.get("positives", 0)
-        result["total"] = raw.get("total", 0)
-
-        if "scan_date" in raw:
-            result["scan_date"] = raw["scan_date"]
+        if stats_field in raw["attributes"]:
+            result["malicious"] = raw["attributes"][stats_field].get("malicious", 0)
+            result["suspicious"] = raw["attributes"][stats_field].get("suspicious", 0)
+            result["type-unsupported"] = raw["attributes"][stats_field].get(
+                "type-unsupported", 0
+            )
+            result["confirmed-timeout"] = raw["attributes"][stats_field].get(
+                "confirmed-timeout", 0
+            )
+            result["timeout"] = raw["attributes"][stats_field].get("timeout", 0)
+            result["failure"] = raw["attributes"][stats_field].get("failure", 0)
+            result["undetected"] = raw["attributes"][stats_field].get("undetected", 0)
+
+            total = 0
+            for category, value in raw["attributes"][stats_field].items():
+                total += value
+            result["total"] = total
+
+        if stats_field in raw["attributes"]:
+            value = "{}/{}".format(
+                result["malicious"] + result["suspicious"], result["total"]
+            )
+            if result["malicious"] > 0:
+                level = "malicious"
+            elif result["suspicious"] > 0:
+                level = "suspicious"
+            elif (
+                result.get("type-unsupported", 0) > 1
+                or result.get("confirmed-timeout", 0) > 1
+                or result.get("timeout", 0) > 1
+                or result.get("failure", 0) > 1
+                or result.get("undetected", 0)
+            ):
+                level = "info"
+            else:
+                level = "safe"
+            taxonomies.append(
+                self.build_taxonomy(level, namespace, predicate, value)
+            )
 
         if self.service == "get":
-            if "scans" in raw:
-                result["scans"] = len(raw["scans"])
-                value = "{}/{}".format(result["positives"], result["total"])
-                if result["positives"] == 0:
-                    level = "safe"
-                elif result["positives"] < 5:
-                    level = "suspicious"
-                else:
-                    level = "malicious"
-
-            if "resolutions" in raw:
-                result["resolutions"] = len(raw["resolutions"])
-                value = "{} resolution(s)".format(result["resolutions"])
-                if result["resolutions"] == 0:
-                    level = "safe"
-                elif result["resolutions"] < 5:
-                    level = "suspicious"
-                else:
-                    level = "malicious"
-
-            if "detected_urls" in raw:
-                result["detected_urls"] = len(raw["detected_urls"])
-                value = "{} detected_url(s)".format(result["detected_urls"])
-                if result["detected_urls"] == 0:
-                    level = "safe"
-                elif result["detected_urls"] < 5:
-                    level = "suspicious"
-                else:
-                    level = "malicious"
-
-            if "detected_downloaded_samples" in raw:
-                result["detected_downloaded_samples"] = len(
-                    raw["detected_downloaded_samples"]
-                )
-
-        if self.service in ["scan", "rescan"]:
-            if "scans" in raw:
-                result["scans"] = len(raw["scans"])
-                value = "{}/{}".format(result["positives"], result["total"])
-                if result["positives"] == 0:
-                    level = "safe"
-                elif result["positives"] < 5:
-                    level = "suspicious"
-                else:
-                    level = "malicious"
-
-        taxonomies.append(self.build_taxonomy(level, namespace, predicate, value))
+            data_type = "files"
+            if raw["type"] == "url":
+                data_type = "urls"
+            elif raw["type"] == "domain":
+                data_type = "domains"
+            elif raw["type"] == "ip_address":
+                data_type = "ip_addresses"
+
+            if data_type in ["files", "urls"]:
+                if "contacted_domains" in raw["relations"]:
+                    nb_domains = raw["relations"]["contacted_domains"]["meta"]["count"]
+                    value = "{} contacted domain(s)".format(nb_domains)
+                    if nb_domains == 0:
+                        level = "safe"
+                    elif nb_domains < 5:
+                        level = "suspicious"
+                    else:
+                        level = "malicious"
+                    taxonomies.append(
+                        self.build_taxonomy(level, namespace, predicate, value)
+                    )
+            
+            if data_type in ["ip_addresses", "domains"]:
+                try:
+                    result["resolutions"] = self.vt.get_object(
+                        "/{}/{}/{}".format(data_type, raw["id"], "resolutions")
+                    ).to_dict()
+                    value = "{} resolution(s)".format(result["meta"]["count"])
+                    if result["meta"]["count"] == 0:
+                        level = "safe"
+                    elif result["meta"]["count"] < 5:
+                        level = "suspicious"
+                    else:
+                        level = "malicious"
+                    taxonomies.append(
+                        self.build_taxonomy(level, namespace, predicate, value)
+                    )
+                except Exception:
+                    pass  # Premium api key required
+
+            if data_type in ["files"]:
+                try:
+                    result["embedded_urls"] = self.vt.get_object(
+                        "/{}/{}/{}".format(data_type, raw["id"], "embedded_urls")
+                    ).to_dict()
+                    value = "{} embedded url(s)".format(result["meta"]["count"])
+                    if result["meta"]["count"] == 0:
+                        level = "safe"
+                    elif result["meta"]["count"] < 5:
+                        level = "suspicious"
+                    else:
+                        level = "malicious"
+                    taxonomies.append(
+                        self.build_taxonomy(level, namespace, predicate, value)
+                    )
+                except Exception:
+                    pass  # Premium api key required
+
+            if data_type in ["files", "ip_addresses", "domains"]:
+                if "downloaded_files" in raw["relations"]:
+                    nb_files = raw["relations"]["downloaded_files"]["meta"]["count"]
+                    value = "{} downloaded file(s)".format(nb_files)
+                    if nb_files == 0:
+                        level = "safe"
+                    elif nb_files < 5:
+                        level = "suspicious"
+                    else:
+                        level = "malicious"
+                    taxonomies.append(
+                        self.build_taxonomy(level, namespace, predicate, value)
+                    )
 
         if self.highlighted_antivirus:
-            for av in self.highlighted_antivirus:
-                detected = raw.get("scans", {}).get(av, {}).get("detected", None)
-                if detected == False:
+            for av in (av for av in self.highlighted_antivirus if av):
+                category = (
+                    raw["attributes"][results_field].get(av, {}).get("category", None)
+                )
+                if category != "malicious" or category != "suspicious":
                     taxonomies.append(
                         self.build_taxonomy("info", namespace, av, "Not detected!")
                     )
@@ -212,26 +228,43 @@ def summary(self, raw):
         return {"taxonomies": taxonomies}
 
     def run(self):
+        results = dict()
+        iocs = dict()
+        iocs['ip'] = list()
+        iocs['domain'] = list()
+        iocs['url'] = list()
+        iocs['other'] = list()
+        
         if self.service == "scan":
             if self.data_type == "file":
-                filename = self.get_param("filename", "noname.ext")
                 filepath = self.get_param("file", None, "File is missing")
-                self.read_scan_response(
-                    self.vt.scan_file(filepath, from_disk=True, filename=filename),
-                    self.wait_file_report,
-                )
+                with open(filepath, "rb") as f:
+                    resp = self.vt.scan_file(file=f, wait_for_completion=True)
+                    results = resp.to_dict()
+                    file_hash = b64decode(results.get("id")).decode().split(':')[0]
+                    self.get_relation("contacted_domains", "files", file_hash, results, iocs)
+                    self.get_relation("contacted_ips", "files", file_hash, results, iocs)
+                    self.get_relation("contacted_urls", "files", file_hash, results, iocs)
+
             elif self.data_type == "url":
-                data = self.get_param("data", None, "Data is missing")
-                self.read_scan_response(self.vt.scan_url(data), self.wait_url_report)
+                url = self.get_param("data", None, "Data is missing")
+                resp = self.vt.scan_url(url=url, wait_for_completion=True)
+                results = resp.to_dict()
+                url_b64 = results.get("id").split("-")[1]
+                self.get_relation("contacted_domains", "files", url_b64, results, iocs)
+                self.get_relation("contacted_ips", "files", url_b64, results, iocs)
+                self.get_relation("last_serving_ip_address", "files", url_b64, results, iocs)
             else:
                 self.error("Invalid data type")
 
         elif self.service == "rescan":
             if self.data_type == "hash":
                 data = self.get_param("data", None, "Data is missing")
-                self.read_scan_response(
-                    self.vt.rescan_file(data), self.wait_file_report
-                )
+                resp = self.vt.post("/files/{}/analyse".format(data)).text()
+                results = json.loads(resp)
+                self.get_relation("contacted_domains", "files", data, results, iocs)
+                self.get_relation("contacted_ips", "files", data, results, iocs)
+                self.get_relation("contacted_urls", "files", data, results, iocs)
             else:
                 self.error("Invalid data type")
 
@@ -242,52 +275,68 @@ def run(self):
                 self.report({"message": "file downloaded"})
 
         elif self.service == "get":
-            if self.data_type == "domain":
-                data = self.get_param("data", None, "Data is missing")
-                results = self.check_response(self.vt.get_domain_report(data))
-
-            elif self.data_type == "fqdn":
-                data = self.get_param("data", None, "Data is missing")
-                results = self.check_response(self.vt.get_domain_report(data))
-
-            elif self.data_type == "ip":
-                data = self.get_param("data", None, "Data is missing")
-                results = self.check_response(self.vt.get_ip_report(data))
-
-            elif self.data_type == "file":
-                hashes = self.get_param("attachment.hashes", None)
-                if hashes is None:
+            try:
+                if self.data_type == "domain" or self.data_type == "fqdn":
+                    data = self.get_param("data", None, "Data is missing")
+                    results = self.vt.get_object("/domains/{}".format(data)).to_dict()
+                    self.get_relation("urls", "domains", data, results, iocs)
+                    self.get_relation("downloaded_files", "domains", data, results, iocs)
+                    self.get_relation("referrer_files", "domains", data, results, iocs)
+
+                elif self.data_type == "ip":
+                    data = self.get_param("data", None, "Data is missing")
+                    results = self.vt.get_object("/ip_addresses/{}".format(data)).to_dict()
+                    self.get_relation("urls", "ip_addresses", data, results, iocs)
+
+                elif self.data_type == "file":
                     filepath = self.get_param("file", None, "File is missing")
-                    hash = hashlib.sha256(open(filepath, "rb").read()).hexdigest()
+                    with open(filepath, "rb") as f:
+                        file_hash = self.file_to_sha256(f)
+                        results = self.vt.get_object("/files/{}".format(file_hash)).to_dict()
+                        self.get_relation("contacted_domains", "files", file_hash, results, iocs)
+                        self.get_relation("contacted_ips", "files", file_hash, results, iocs)
+                        self.get_relation("contacted_urls", "files", file_hash, results, iocs)
+
+                elif self.data_type == "hash":
+                    data = self.get_param("data", None, "Data is missing")
+                    results = self.vt.get_object("/files/{}".format(data)).to_dict()
+                    self.get_relation("contacted_domains", "files", data, results, iocs)
+                    self.get_relation("contacted_ips", "files", data, results, iocs)
+                    self.get_relation("contacted_urls", "files", data, results, iocs)
+
+                elif self.data_type == "url":
+                    url = self.get_param("data", None, "Data is missing")
+                    url_b64 = urlsafe_b64encode(url.encode()).decode().split("=")[0]
+                    results = self.vt.get_object("/urls/{}".format(url_b64)).to_dict()
+                    self.get_relation("contacted_domains", "urls", url_b64, results, iocs)
+                    self.get_relation("contacted_ips", "urls", url_b64, results, iocs)
+                    self.get_relation("last_serving_ip_address", "urls", url_b64, results, iocs)
                 else:
-                    hash = next(h for h in hashes if len(h) == 64)
-                results = self.check_response(self.vt.get_file_report(hash))
-
-            elif self.data_type == "hash":
-                data = self.get_param("data", None, "Data is missing")
-                results = self.check_response(self.vt.get_file_report(data))
-
-            elif self.data_type == "url":
-                data = self.get_param("data", None, "Data is missing")
-                results = self.check_response(self.vt.get_url_report(data))
-            else:
-                self.error("Invalid data type")
-
-            # if aged and enabled rescan
-            if self.data_type == "hash" and self.rescan_hash_older_than_days:
-                if (
-                    datetime.strptime(results["scan_date"], "%Y-%m-%d %H:%M:%S")
-                    - datetime.now()
-                ).days > self.rescan_hash_older_than_days:
-                    self.read_scan_response(
-                        self.vt.rescan_file(data), self.wait_file_report
-                    )
+                    self.error("Invalid data type")
+                self.get_yararuleset(results, iocs)
+                self.get_ids_results(results, iocs)
+
+                # if aged and enabled rescan
+                if self.data_type == "hash" and self.rescan_hash_older_than_days:
+                    if (
+                        datetime.fromtimestamp(results["attributes"]["last_analysis_date"])
+                        - datetime.now()
+                    ).days > self.rescan_hash_older_than_days:
+                        filepath = self.get_param("file", None, "File is missing")
+                        with open(filepath, "rb") as f:
+                            self.vt.scan_file(file=f, wait_for_completion=True)
+            except Exception:
+                self.report({"message": "Report not found."})
+                return
 
             # download if hash, dangerous and not seen by av
             if (
                 self.data_type == "hash"
                 and (results.get("response_code", None) == 1)
-                and (results.get("positives", 0) >= 5)
+                and (
+                    results["attributes"]["last_analysis_stats"].get("malicious", 0)
+                    >= 5
+                )
                 and (
                     self.download_sample
                     or (
@@ -306,11 +355,49 @@ def run(self):
                 )
             ):
                 self.get_file(data)
-            self.report(results)
-
         else:
             self.error("Invalid service")
-
+        results['iocs'] = iocs
+        self.report(results)
+
+    def get_yararuleset(self, results, iocs):
+        for yara_result in results["attributes"].get( "crowdsourced_yara_results", []):
+            yara_ruleset = self.vt.get_object(
+                        "/yara_rulesets/{}".format(yara_result["ruleset_id"])
+                        ).to_dict()
+            iocs["other"].append({
+                "data": yara_ruleset["attributes"]["rules"],
+                "tags": [
+                    "detection:YARA",
+                    "ruleset:{}".format(yara_ruleset["attributes"]["name"])
+                ]
+            })
+
+    def get_ids_results(self, results, iocs):
+        for ids_result in results["attributes"].get("crowdsourced_ids_results", []):
+            iocs["other"].append({
+                "data": ids_result["rule_raw"],
+                "tags": [
+                    "detection:IDS",
+                    "rule-src:{}".format(ids_result["rule_source"])
+                ]
+            })
+
+    def get_relation(self, relation, data_type, data, results, iocs):
+        try:
+            result = self.vt.get_json(
+                "/{}/{}/{}".format(data_type, data, relation)
+            )
+            if not "relations" in results:
+                results["relations"] = {}
+            results['relations'][relation] = result
+            for url in result['data']:
+                iocs["url"].append({
+                    "data": url['attributes']['url'],
+                    "tags": ["known-relationship:{}".format(data_type.replace("_", "-"))]
+                })
+        except Exception:
+            pass #Premium api required
 
 if __name__ == "__main__":
     VirusTotalAnalyzer().run()
diff --git a/thehive-templates/EmlParser_2_0/short.html b/thehive-templates/EmlParser_2_0/short.html
deleted file mode 100644
index 57f9d29cf..000000000
--- a/thehive-templates/EmlParser_2_0/short.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<span class="label" ng-repeat="t in content.taxonomies" ng-class="{'info': 'label-info', 'safe': 'label-success', 'suspicious': 'label-warning', 'malicious':'label-danger'}[t.level]">
-    {{t.namespace}}:{{t.predicate}}={{t.value}}
-</span>
diff --git a/thehive-templates/VirusTotal_DownloadSample_3_1/long.html b/thehive-templates/VirusTotal_DownloadSample_3_1/long.html
new file mode 100644
index 000000000..8e36bfb8a
--- /dev/null
+++ b/thehive-templates/VirusTotal_DownloadSample_3_1/long.html
@@ -0,0 +1,21 @@
+<!-- General error  -->
+<div class="panel panel-danger" ng-if="!success">
+    <div class="panel-heading">
+        <strong>VirusTotal GetReport: download failed</strong>
+    </div>
+    <div class="panel-body">
+        <strong>The file could not be downloaded. Check if your VirusTotal API key is linked to an Entreprise account.</strong>
+    </div>
+</div>
+
+<!-- Success -->
+<div ng-switch="content.response_code" ng-if="success">
+    <div class="panel panel-info">
+        <div class="panel-heading">
+            <strong>VirusTotal GetReport: Success</strong>
+        </div>
+        <div class="panel-body">
+            The file has been downloaded successfully and automatically added in the report and the Case.
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/thehive-templates/VirusTotal_GetReport_3_0/long.html b/thehive-templates/VirusTotal_GetReport_3_0/long.html
deleted file mode 100644
index ef25f7b79..000000000
--- a/thehive-templates/VirusTotal_GetReport_3_0/long.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<div class="panel panel-danger" ng-if="!success">
-    <div class="panel-heading">
-        <strong>{{(artifact.data || artifact.attachment.name) | fang}}</strong>
-    </div>
-    <div class="panel-body">
-        {{content.errorMessage}}
-    </div>
-</div>
-
-<div ng-switch="content.response_code" ng-if="success">
-    <div ng-switch-when="1">
-        <div class="panel panel-info">
-            <div class="panel-heading">
-                <strong>Summary</strong>
-            </div>
-            <div class="panel-body">
-                <dl class="dl-horizontal" ng-if="content.positives">
-                    <dt>Score</dt>
-                    <dd class="wrap">{{content.positives || 0}}/{{content.total}}</dd>
-                </dl>
-                <dl class="dl-horizontal" ng-if="content.scan_date">
-                    <dt>Last analysis date</dt>
-                    <dd class="wrap">{{content.scan_date}}</dd>
-                </dl>
-                <dl class="dl-horizontal" ng-if="content.as_owner">
-                    <dt>Autonomous System</dt>
-                    <dd class="wrap">{{content.as_owner}}</dd>
-                </dl>
-                <dl class="dl-horizontal" ng-if="content.categories">
-                    <dt>Categories</dt>
-                    <dd class="wrap">{{content.categories.join(', ')}}</dd>
-                </dl>
-                <dl class="dl-horizontal" ng-if="content.subdomains">
-                    <dt>Sub domains</dt>
-                    <dd class="wrap">{{content.subdomains.join(', ')}}</dd>
-                </dl>
-                <dl class="dl-horizontal" ng-if="content.resolutions && content.resolutions.length > 0">
-                    <dt>Resolutions</dt>
-                    <dd>
-                        <div ng-if="::artifact.dataType === 'domain'">
-                            <strong>This domain has been seen to resolve to the following IP addresses.</strong>
-                        </div>
-                        <div ng-if="::artifact.dataType === 'ip'">
-                            <strong>The following domains resolved to the given IP address.</strong>
-                        </div>
-                        <div ng-repeat="resolution in ::content.resolutions | limitTo:20">
-                            {{::resolution.last_resolved | amDateFormat:'DD-MM-YYYY'}}:
-                            <span class="text-danger wrap">{{(resolution.ip_address | fang) || (resolution.hostname | fang)}}</span>
-                        </div>
-                    </dd>
-                </dl>
-                <dl class="dl-horizontal" ng-if="content.permalink">
-                    <dt>Virus Total</dt>
-                    <dd>
-                        <span ng-if="content.permalink">
-                            <i class="fa fa-search"></i>
-                            <a ng-href="{{content.permalink}}" target="_blank">View Full Report</a>
-                        </span>
-                    </dd>
-                </dl>
-            </div>
-        </div>
-
-        <div class="panel panel-info" ng-if="::content.detected_urls" ng-init="detected_urls_limit = 20">
-            <div class="panel-heading">
-                <strong>Latest detected URLs</strong>
-                <span class="pull-right" ng-show="::content.detected_urls.length > 20">
-                    <a href ng-show="detected_urls_limit===20" ng-click="detected_urls_limit = undefined">Show All ({{::content.detected_urls.length}})</a>
-                    <a href ng-show="!detected_urls_limit"ng-click="detected_urls_limit = 20">Show less</a>
-                </span>
-            </div>
-            <div class="panel-body">
-                <p>Latest URLs hosted in this IP address
-                    <strong>detected by at least one URL scanner or malicious URL dataset.</strong>
-                </p>
-                <table class="table table-hover">
-                    <tr>
-                        <th>Score</th>
-                        <th>Scan Date</th>
-                        <th>URL</th>
-                    </tr>
-                    <tr ng-repeat="url in content.detected_urls | limitTo:detected_urls_limit">
-                        <td>
-                            <span ng-class="{'text-danger': url.positives > 0}">{{::url.positives}}/{{::url.total}}</span>
-                        </td>
-                        <td>{{url.scan_date}}</td>
-                        <td class="wrap">{{url.url | fang}}</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div class="panel panel-info" ng-if="content.detected_downloaded_samples" ng-init="detected_downloaded_samples_limit=20">
-            <div class="panel-heading">
-                <strong>Latest detected files that were downloaded from this IP address</strong>
-                <span class="pull-right" ng-show="::content.detected_downloaded_samples.length > 20">
-                    <a href ng-show="detected_downloaded_samples_limit===20" ng-click="detected_downloaded_samples_limit = undefined">Show All ({{::content.detected_downloaded_samples.length}})</a>
-                    <a href ng-show="!detected_downloaded_samples_limit"ng-click="detected_downloaded_samples_limit = 20">Show less</a>
-                </span>
-            </div>
-            <div class="panel-body">
-                <p>Latest files that are
-                    <strong>detected by at least one antivirus solution and were downloaded by VirusTotal from the IP address provided.</strong>
-                </p>
-                <table class="table table-hover">
-                    <tr>
-                        <th>Score</th>
-                        <th>Date</th>
-                        <th>SHA256</th>
-                    </tr>
-                    <tr ng-repeat="hash in content.detected_downloaded_samples | limitTo:detected_downloaded_samples_limit">
-                        <td>
-                            <span ng-class="{'text-danger': hash.positives > 0}">{{hash.positives}}/{{hash.total}}</span>
-                        </td>
-                        <td>{{hash.date}}</td>
-                        <td>{{hash.sha256}}</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div class="panel panel-info" ng-if="content.detected_referrer_samples" ng-init="detected_referrer_samples_limit=20">
-            <div class="panel-heading">
-                <strong>Latest detected files that embed this IP address in their strings</strong>
-                <span class="pull-right" ng-show="::content.detected_referrer_samples.length > 20">
-                    <a href ng-show="detected_referrer_samples_limit===20" ng-click="detected_referrer_samples_limit = undefined">Show All ({{::content.detected_referrer_samples.length}})</a>
-                    <a href ng-show="!detected_referrer_samples_limit" ng-click="detected_referrer_samples_limit = 20">Show less</a>
-                </span>
-            </div>
-            <div class="panel-body">
-                <p>Latest files that are
-                    <strong>detected by at least one antivirus solution and embed URL pattern strings with the IP address provided.</strong>
-                </p>
-                <table class="table table-hover">
-                    <tr>
-                        <th>Score</th>
-                        <th>SHA256</th>
-                    </tr>
-                    <tr ng-repeat="hash in content.detected_referrer_samples | limitTo:detected_referrer_samples_limit">
-                        <td>
-                            <span ng-class="{'text-danger': hash.positives > 0}">{{hash.positives}}/{{hash.total}}</span>
-                        </td>
-                        <td>{{hash.sha256}}</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div class="panel panel-info" ng-if="content.scans">
-            <div class="panel-heading">
-                <strong>Scans</strong>
-            </div>
-            <div class="panel-body">
-
-                <table class="table table-hover">
-                    <tr>
-                        <th>Scanner</th>
-                        <th>Detected</th>
-                        <th>Result</th>
-                        <th>Details</th>
-                        <th>Update</th>
-                        <th>Version</th>
-                    </tr>
-                    <tr ng-init="result.unrated = (result.result === 'unrated site')" ng-repeat="(scanner, result) in content.scans">
-                        <td>
-                            <strong>{{scanner}}</strong>
-                        </td>
-                        <td>
-                            <i ng-class="{'text-danger fa fa-bug': result.detected, 'text-success fa fa-check-circle': !result.detected && !result.unrated, 'text-info fa fa-question-circle': result.unrated}"></i>
-                        </td>
-                        <td ng-class="{'text-info': result.unrated, 'text-danger': result.detected, 'text-success': !result.detected && !result.unrated}" class="wrap">{{result.result}}</td>
-                        <td>
-                            <a ng-href="{{result.detail}}" ng-if="result.detail" target="_blank">
-                                <i class="fa fa-search"></i>
-                                View details</a>
-                        </td>
-                        <td>{{result.update}}</td>
-                        <td>{{result.version}}</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-    </div>
-    <div ng-switch-default>
-        <div class="panel panel-danger">
-            <div class="panel-heading">
-                <strong>{{(artifact.data || artifact.attachment.name) | fang}}</strong>
-            </div>
-            <div class="panel-body">
-                {{content.verbose_msg}}
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/thehive-templates/VirusTotal_GetReport_3_0/short.html b/thehive-templates/VirusTotal_GetReport_3_0/short.html
deleted file mode 100644
index 5fc0dabfb..000000000
--- a/thehive-templates/VirusTotal_GetReport_3_0/short.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<span class="label" ng-repeat="t in content.taxonomies" ng-class="{'info': 'label-info', 'safe': 'label-success', 'suspicious': 'label-warning', 'malicious':'label-danger'}[t.level]">
-    {{t.namespace}}:{{t.predicate}}="{{t.value}}"
-</span>
diff --git a/thehive-templates/VirusTotal_GetReport_3_1/long.html b/thehive-templates/VirusTotal_GetReport_3_1/long.html
new file mode 100644
index 000000000..051b56285
--- /dev/null
+++ b/thehive-templates/VirusTotal_GetReport_3_1/long.html
@@ -0,0 +1,551 @@
+<!-- General error  -->
+<div class="panel panel-danger" ng-if="!success">
+    <div class="panel-heading">
+        <strong>VirusTotal GetReport</strong>
+    </div>
+    <div class="panel-body">{{content.errorMessage}}</div>
+</div>
+
+<!-- Success -->
+<div ng-switch="content.response_code" ng-if="success">
+    <div class="panel panel-info">
+        <div class="panel-heading">
+            <strong>Summary</strong>
+        </div>
+        <div class="panel-body">
+            <div class="row" style="margin-bottom: 1em">
+                <div class="text-center col-md-6">
+                    <dl
+                            class="dl-horizontal"
+                            ng-if="content.message"
+                    >
+                        <dt>Message</dt>
+                        <dd class="wrap">
+                            {{content.message}}
+                        </dd>
+                    </dl>
+                    <dl
+                            class="dl-horizontal"
+                            ng-if="content.attributes.last_analysis_stats"
+                            ng-init="stats = content.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <dt>Malicious</dt>
+                        <dd class="wrap">
+                            <strong style="color: #fa541c">{{content.attributes.last_analysis_stats.malicious}}</strong>/{{total}}
+                        </dd>
+                    </dl>
+                    <dl
+                            class="dl-horizontal"
+                            ng-if="content.attributes.last_analysis_stats"
+                            ng-init="stats = content.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <dt>Suspicious</dt>
+                        <dd class="wrap">
+                            <strong style="color: #ffa940">{{content.attributes.last_analysis_stats.suspicious}}</strong>/{{total}}
+                        </dd>
+                    </dl>
+                    <dl
+                            class="dl-horizontal"
+                            ng-if="content.attributes.last_analysis_stats"
+                            ng-init="stats = content.attributes.last_analysis_stats;
+                                     others = stats.type-unsupported + stats.confirmed-timeout + stats.timeout + stats.failure + stats.undetected;
+                                     total = others + stats.harmless + stats.malicious + stats.suspicious"
+                    >
+                        <dt>Undefined</dt>
+                        <dd class="wrap">
+                            <strong class="text-info">{{others}}</strong>/{{total}}
+                        </dd>
+                    </dl>
+                </div>
+                <div class="col-md-6">
+                    <dl class="dl-horizontal" ng-if="content.attributes.size">
+                        <dt>Size</dt>
+                        <dd class="wrap">{{content.attributes.size}}B</dd>
+                    </dl>
+                    <dl class="dl-horizontal" ng-if="content.attributes.last_analysis_date">
+                        <dt>Last analysis date</dt>
+                        <dd class="wrap">
+                            {{content.attributes.last_analysis_date*1000 | date: 'yyyy-MM-dd HH:mm:ss'}}
+                        </dd>
+                    </dl>
+                </div>
+            </div>
+            <div class="row">
+                <dl class="dl-horizontal" ng-if="content.attributes.names">
+                    <dt>Names</dt>
+                    <dd class="wrap" ng-repeat="name in content.attributes.names">{{name}}</dd>
+                </dl>
+                <dl class="dl-horizontal" ng-if="content.attributes.url">
+                    <dt>Url</dt>
+                    <dd class="wrap">{{content.attributes.url}}</dd>
+                </dl>
+                <dl class="dl-horizontal" ng-if="content.id && content.type != 'domain' && content.type != 'fqdn'">
+                    <dt>SHA-256</dt>
+                    <dd class="wrap">{{content.id}}</dd>
+                </dl>
+                <div class="col-md-6 text-center"
+                     ng-if="content.id && (content.type == 'domain' || content.type ==  'fqdn')">
+                    <dl class="dl-horizontal">
+                        <dt>Resolution</dt>
+                        <dd class="wrap">{{content.id}}</dd>
+                    </dl>
+                </div>
+            </div>
+            <div class="row">
+                <dl class="dl-horizontal" ng-if="content.attributes.last_analysis_results">
+                    <dt>VirusTotal Report</dt>
+                    <dd>
+                        <a
+                                ng-href="{{'https://www.virustotal.com/gui/search/'+content.id}}"
+                                target="_blank"
+                                ng-if="content.type != 'url'"
+                        >
+                            https://www.virustotal.com/gui/search/{{content.id}}
+                        </a>
+                        <a
+                                ng-href="{{'https://www.virustotal.com/gui/url/'+content.id}}"
+                                target="_blank"
+                                ng-if="content.type == 'url'"
+                        >
+                            https://www.virustotal.com/gui/url/{{content.id}}
+                        </a>
+                    </dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.attributes.crowdsourced_yara_results">
+        <div class="panel-heading">
+            <strong>Crowdsourced YARA results</strong>
+        </div>
+        <div class="panel-body">
+            <div ng-repeat="result in content.attributes.crowdsourced_yara_results">
+                <div class="row" style="margin-bottom: 1em">
+                    <div class="text-center col-md-1">
+                        <i class="fa fa-exclamation-triangle" style="color: #ffa940"></i>
+                    </div>
+                    <div class="col-md-11">
+                        Matches rule <span style="color: #ffa940">{{result.rule_name}}</span> by
+                        <i>{{result.author}}</i> from {{result.ruleset_name}} at
+                        <a style="color: black; text-decoration: underline" target="_blank" ng-href="{{result.source}}"
+                        >{{result.source}}</a
+                        >
+                        <br/>
+                        <span style="color: #666666">
+                            <div class="row" style="margin-bottom: 1em">
+                                <div class="text-center col-md-1" style="width:0%; padding-right:0.5%">
+                                    <i class="fa fa-info-circle"></i>
+                                </div>
+                                <div class="col-md-11">
+                                    {{result.description}}
+                                </div>
+                            </div>
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.attributes.crowdsourced_ids_stats">
+        <div class="panel-heading">
+            <strong>Crowdsourced IDS stats</strong>
+        </div>
+        <div class="panel-body">
+            <div class="row text-center" style="font-weight: bold">
+                <div class="col-md-3 text-success">LOW: {{content.attributes.crowdsourced_ids_stats.low}}</div>
+                <div class="col-md-3 text-info">INFO: {{content.attributes.crowdsourced_ids_stats.info}}</div>
+                <div class="col-md-3" style="color: #ffa940">
+                    MEDIUM: {{content.attributes.crowdsourced_ids_stats.medium}}
+                </div>
+                <div class="col-md-3 text-danger">HIGH: {{content.attributes.crowdsourced_ids_stats.high}}</div>
+            </div>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.attributes.crowdsourced_ids_results">
+        <div class="panel-heading">
+            <strong>Crowdsourced IDS results</strong>
+        </div>
+        <div class="panel-body">
+            <div ng-repeat="result in content.attributes.crowdsourced_ids_results">
+                <div class="row" style="margin-bottom: 1em">
+                    <div class="text-center col-md-1">
+                        <i class="fa fa-exclamation-triangle mt-auto mb-auto"
+                           ng-class="result.alert_severity == 'high' ? 'text-danger' : (scanner.category == 'medium' ? 'text-warning' : (scanner.category == 'low' ? 'text-success' : 'text-info' ))">
+                        </i>
+                    </div>
+
+                    <div class="col-md-11">
+                        Matches rule <span style="color: #ffa940">{{result.rule_msg}}</span> from {{result.rule_source}}
+                        at
+                        <a style="color: black; text-decoration: underline" target="_blank" ng-href="{{result.source}}"
+                        >{{result.rule_url}}</a
+                        >
+                        <br/>
+                        <span style="color: #666666">
+                            <div class="row" style="margin-bottom: 1em">
+                                <div class="text-center col-md-1" style="width:0%; padding-right:0.5%">
+                                <i class="fa fa-info-circle"></i>
+                                </div>
+                                <div class="col-md-11">
+                                    <strong>Category: </strong>{{result.rule_category}}
+                                    <div>
+                                        <strong>Destinations: </strong>
+                                        <span ng-repeat="data in result.alert_context" style="margin-right:5%">
+                                            {{data.dest_ip}}:{{data.dest_port}} 
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.attributes.sandbox_verdicts">
+        <div class="panel-heading">
+            <strong>Sandbox Verdicts</strong>
+        </div>
+        <div class="panel-body">
+            <div ng-repeat="verdict in content.attributes.sandbox_verdicts">
+                <div class="row">
+                    <div class="col-md-2">
+                        <div><strong>{{verdict.sandbox_name}}</strong></div>
+                    </div>
+                    <div class="col-md-4">
+                        <dl class="dl-horizontal">
+                            <dt>Category</dt>
+                            <dd class="wrap">{{verdict.category}}</dd>
+                        </dl>
+                    </div>
+                    <div class="col-md-6">
+                        <dl class="dl-horizontal">
+                            <dt>Classification(s)</dt>
+                            <dd class="wrap" ng-repeat="classification in verdict.malware_classification">
+                                {{classification}}
+                            </dd>
+                        </dl>
+                    </div>
+                </div>
+                <hr ng-if="verdict == content.attributes.sandbox_verdicts.at(-1)"
+                    style="background-color: #d8ecf6; height: 1px;">
+            </div>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_urls.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Contacted URLs</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.contacted_urls.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Scanned</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Status</th>
+                    <th scope="col">URL</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="url in content.relations.contacted_urls.data">
+                    <td>
+                        <strong>{{url.attributes.last_analysis_date*1000 | date: 'yyyy-MM-dd'}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = url.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="url.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{url.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{url.attributes.last_http_response_code || "-"}}</td>
+                    <td>{{url.attributes.url || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_domains.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Contacted Domains</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.contacted_domains.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Domain</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Created</th>
+                    <th scope="col">Registrar</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="domain in content.relations.contacted_domains.data">
+                    <td>
+                        <strong>{{domain.id}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = domain.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="domain.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{domain.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td ng-if="domain.attributes.creation_date">{{domain.attributes.creation_date*1000 | date:
+                        'yyyy-MM-dd'}}
+                    </td>
+                    <td ng-if="!domain.attributes.creation_date">-</td>
+                    <td>{{domain.attributes.registrar || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.last_serving_ip_address.meta.count > 0">
+        <div class="panel-heading">
+            <strong>Last Serving IP Address</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">IP</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Autonomous System</th>
+                    <th scope="col">Country</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-init="ip = content.relations.last_serving_ip_address.data">
+                    <td>
+                        <strong>{{ip.id}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = ip.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="ip.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{ip.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{ip.attributes.asn || "-"}}</td>
+                    <td>{{ip.attributes.country || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_ips.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Contacted IP Addresses</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.contacted_ips.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">IP</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Autonomous System</th>
+                    <th scope="col">Country</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="ip in content.relations.contacted_ips.data">
+                    <td>
+                        <strong>{{ip.id}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = ip.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="ip.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{ip.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{ip.attributes.asn || "-"}}</td>
+                    <td>{{ip.attributes.country || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.urls.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Detected URLs</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.urls.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Scanned</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Status</th>
+                    <th scope="col">URL</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="url in content.relations.urls.data">
+                    <td>
+                        <strong>{{url.attributes.last_analysis_date*1000 | date: 'yyyy-MM-dd'}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = url.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="url.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{url.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{url.attributes.last_http_response_code || "-"}}</td>
+                    <td>{{url.attributes.url || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.downloaded_files.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Detected files downloaded from this domain</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.downloaded_files.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Scanned</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">SHA256</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="file in content.relations.downloaded_files.data">
+                    <td>
+                        <strong>{{file.attributes.last_analysis_date*1000 | date: 'yyyy-MM-dd'}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = file.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="file.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{file.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{file.attributes.sha256 || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.referrer_files.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Detected files which refer to this domain</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.referrer_files.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Scanned</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">SHA256</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="file in content.relations.referrer_files.data">
+                    <td>
+                        <strong>{{file.attributes.last_analysis_date*1000 | date: 'yyyy-MM-dd'}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = file.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="file.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{file.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{file.attributes.sha256 || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.attributes.last_analysis_results">
+        <div class="panel-heading">
+            <strong>Scans</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Scanner</th>
+                    <th scope="col">Detected</th>
+                    <th scope="col" ng-if="content.type == 'url'">Result</th>
+                    <th scope="col">Method</th>
+                    <th scope="col" ng-if="content.type != 'url'">Update</th>
+                    <th scope="col" ng-if="content.type != 'url'">Version</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="scanner in content.attributes.last_analysis_results">
+                    <td>
+                        <strong>{{scanner.engine_name}}</strong>
+                    </td>
+                    <td>
+                        <i
+                                ng-class="scanner.category == 'malicious' ? 'text-danger fas fa-bug' : (scanner.category == 'suspicious' ? 'text-warning fas fa-bug' : (scanner.category == 'harmless' ? 'text-success fas fa-check-circle' : 'text-info fas fa-question-circle' ))"
+                        >
+                        </i>
+                    </td>
+                    <td
+                            ng-if="content.type == 'url'"
+                            ng-class="{'text-danger': scanner.category == 'malicious', 'text-warning': scanner.category == 'suspicious', 'text-success': scanner.category == 'harmless', 'text-info': scanner.category == 'failure' && scanner.category == 'undetected' && scanner.category == 'type-unsupported' }"
+                            class="wrap"
+                    >
+                        {{scanner.result || "null"}}
+                    </td>
+                    <td>{{scanner.method || "null"}}</td>
+                    <td ng-if="content.type != 'url'">
+                        {{scanner.engine_update.slice(0,4)+"/"+scanner.engine_update.slice(4,6)+"/"+scanner.engine_update.slice(6,8)}}
+                    </td>
+                    <td ng-if="content.type != 'url'">{{scanner.engine_version || ""}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
diff --git a/thehive-templates/VirusTotal_Rescan_3_1/long.html b/thehive-templates/VirusTotal_Rescan_3_1/long.html
new file mode 100644
index 000000000..44b9a4cfd
--- /dev/null
+++ b/thehive-templates/VirusTotal_Rescan_3_1/long.html
@@ -0,0 +1,204 @@
+<!-- General error  -->
+<div class="panel panel-danger" ng-if="!success">
+    <div class="panel-heading">
+        <strong>VirusTotal GetReport</strong>
+    </div>
+    <div class="panel-body">{{content.errorMessage}}</div>
+</div>
+
+<!-- Success -->
+<div ng-switch="content.response_code" ng-if="success">
+    <div class="panel panel-info">
+        <div class="panel-heading">
+            <strong>Summary</strong>
+        </div>
+        <div class="panel-body">
+            <dl class="dl-horizontal" ng-if="content.data.id">
+                <dt>Id (base64)</dt>
+                <dd class="wrap">{{content.data.id}}</dd>
+            </dl>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_urls.meta.count > 0">
+        <div class="panel-heading">
+            <strong>Contacted URLs</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Scanned</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Status</th>
+                    <th scope="col">URL</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="url in content.relations.contacted_urls.data">
+                    <td>
+                        <strong>{{url.attributes.last_analysis_date*1000 | date: 'yyyy-MM-dd'}}</strong>
+                    </td>
+                    <td
+                        ng-init="stats = url.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="url.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{url.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{url.attributes.last_http_response_code || "-"}}</td>
+                    <td>{{url.attributes.url || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_domains.meta.count > 0">
+        <div class="panel-heading">
+            <strong>Contacted Domains</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Domain</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Created</th>
+                    <th scope="col">Registrar</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="domain in content.relations.contacted_domains.data">
+                    <td>
+                        <strong>{{domain.id}}</strong>
+                    </td>
+                    <td
+                        ng-init="stats = domain.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="domain.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{domain.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td ng-if="domain.attributes.creation_date">{{domain.attributes.creation_date*1000 | date: 'yyyy-MM-dd'}}</td>
+                    <td ng-if="!domain.attributes.creation_date">-</td>
+                    <td>{{domain.attributes.registrar || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_ips.meta.count > 0">
+        <div class="panel-heading">
+            <strong>Contacted IP Addresses</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">IP</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Autonomous System</th>
+                    <th scope="col">Country</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="ip in content.relations.contacted_ips.data">
+                    <td>
+                        <strong>{{ip.id}}</strong>
+                    </td>
+                    <td
+                        ng-init="stats = ip.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="ip.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{ip.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{ip.attributes.asn || "-"}}</td>
+                    <td>{{ip.attributes.country || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.last_serving_ip_address.meta.count > 0">
+        <div class="panel-heading">
+            <strong>Last Serving IP Address</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">IP</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Autonomous System</th>
+                    <th scope="col">Country</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-init="ip = content.relations.last_serving_ip_address.data">
+                    <td>
+                        <strong>{{ip.id}}</strong>
+                    </td>
+                    <td
+                        ng-init="stats = ip.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="ip.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{ip.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{ip.attributes.asn || "-"}}</td>
+                    <td>{{ip.attributes.country || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.attributes.results">
+        <div class="panel-heading">
+            <strong>Scans</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                    <tr>
+                        <th scope="col">Scanner</th>
+                        <th scope="col">Detected</th>
+                        <th scope="col" ng-if="content.id[0] == 'u'">Result</th>
+                        <th scope="col">Method</th>
+                        <th scope="col" ng-if="content.id[0] != 'u'">Update</th>
+                        <th scope="col" ng-if="content.id[0] != 'u'">Version</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="scanner in content.attributes.results">
+                        <td>
+                            <strong>{{scanner.engine_name}}</strong>
+                        </td>
+                        <td>
+                            <i
+                                ng-class="scanner.category == 'malicious' ? 'text-danger fas fa-bug' : (scanner.category == 'suspicious' ? 'text-warning fas fa-bug' : (scanner.category == 'harmless' ? 'text-success fas fa-check-circle' : 'text-info fas fa-question-circle' ))"
+                            >
+                            </i>
+                        </td>
+                        <td
+                            ng-if="content.id[0] == 'u'"
+                            ng-class="{'text-danger': scanner.category == 'malicious', 'text-warning': scanner.category == 'suspicious', 'text-success': scanner.category == 'harmless', 'text-info': scanner.category == 'failure' && scanner.category == 'undetected' && scanner.category == 'type-unsupported' }"
+                            class="wrap"
+                        >
+                            {{scanner.result || "null"}}
+                        </td>
+                        <td>{{scanner.method || "null"}}</td>
+                        <td ng-if="content.id[0] != 'u'">
+                            {{scanner.engine_update.slice(0,4)+"/"+scanner.engine_update.slice(4,6)+"/"+scanner.engine_update.slice(6,8)}}
+                        </td>
+                        <td ng-if="content.id[0] != 'u'">{{scanner.engine_version || ""}}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/thehive-templates/VirusTotal_Scan_3_0/long.html b/thehive-templates/VirusTotal_Scan_3_0/long.html
deleted file mode 100644
index d3275fc6a..000000000
--- a/thehive-templates/VirusTotal_Scan_3_0/long.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="panel panel-danger" ng-if="!success">
-    <div class="panel-heading">
-        <strong>{{(artifact.data || artifact.attachment.name) | fang}}</strong>
-    </div>
-    <div class="panel-body">
-        {{content.errorMessage}}
-    </div>
-</div>
-
-
-<div ng-switch="content.response_code" ng-if="success">
-    <div ng-switch-when="1">
-        <div class="panel panel-info">
-            <div class="panel-heading"><strong>Summary</strong></div>
-            <div class="panel-body">
-                <dl class="dl-horizontal">
-                    <dt>Score</dt>
-                    <dd>{{content.positives}}/{{content.total}}</dd>
-                </dl>
-                <dl class="dl-horizontal">
-                    <dt>Last analysis date</dt>
-                    <dd>{{content.scan_date}}</dd>
-                </dl>
-                <dl class="dl-horizontal" ng-if="content.permalink">
-                    <dt>Virus Total</dt>
-                    <dd>
-                        <span>
-                            <i class="fa fa-search"></i>
-                            <a href="{{content.permalink}}" target="_blank">
-                                View Full Report</a>
-                        </span>
-                    </dd>
-                </dl>
-            </div>
-        </div>
-
-        <div class="panel panel-info">
-            <div class="panel-heading"><strong>Scans</strong></div>
-            <div class="panel-body">
-
-                <table class="table table-hover">
-                    <tr>
-                        <th>Scanner</th>
-                        <th>Detected</th>
-                        <th>Result</th>
-                        <th>Details</th>
-                        <th>Update</th>
-                        <th>Version</th>
-                    </tr>
-                    <tr ng-repeat="(scanner, result) in content.scans" ng-init="result.unrated = (result.result === 'unrated site')">
-                        <td><strong>{{scanner}}</strong></td>
-                        <td>
-                            <i ng-class="{'text-danger fa fa-bug': result.detected, 'text-success fa fa-check-circle': !result.detected && !result.unrated, 'text-info fa fa-question-circle': result.unrated}"></i>
-                        </td>
-                        <td ng-class="{'text-info': result.unrated, 'text-danger': result.detected, 'text-success': !result.detected && !result.unrated}" class="wrap">{{result.result}}</td>
-                        <td>
-                            <a ng-if="result.detail" ng-href="{{result.detail}}" target="_blank"><i class="fa fa-search"></i> View details</a>
-                        </td>
-                        <td>{{result.update}}</td>
-                        <td>{{result.version}}</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-
-    </div>
-    <div ng-switch-default>
-        <div class="panel panel-danger">
-            <div class="panel-heading">
-                <strong>{{(artifact.data || artifact.attachment.name)| fang}}</strong>
-            </div>
-            <div class="panel-body">
-                {{content.verbose_msg}}
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/thehive-templates/VirusTotal_Scan_3_0/short.html b/thehive-templates/VirusTotal_Scan_3_0/short.html
deleted file mode 100644
index 5fc0dabfb..000000000
--- a/thehive-templates/VirusTotal_Scan_3_0/short.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<span class="label" ng-repeat="t in content.taxonomies" ng-class="{'info': 'label-info', 'safe': 'label-success', 'suspicious': 'label-warning', 'malicious':'label-danger'}[t.level]">
-    {{t.namespace}}:{{t.predicate}}="{{t.value}}"
-</span>
diff --git a/thehive-templates/VirusTotal_Scan_3_1/long.html b/thehive-templates/VirusTotal_Scan_3_1/long.html
new file mode 100644
index 000000000..10fd7e1d0
--- /dev/null
+++ b/thehive-templates/VirusTotal_Scan_3_1/long.html
@@ -0,0 +1,264 @@
+<!-- General error  -->
+<div class="panel panel-danger" ng-if="!success">
+    <div class="panel-heading">
+        <strong>VirusTotal GetReport</strong>
+    </div>
+    <div class="panel-body">{{content.errorMessage}}</div>
+</div>
+
+<!-- Success -->
+<div ng-switch="content.response_code" ng-if="success">
+    <div class="panel panel-info">
+        <div class="panel-heading">
+            <strong>Summary</strong>
+        </div>
+        <div class="panel-body">
+            <dl
+                class="dl-horizontal"
+                ng-if="content.attributes.stats"
+                ng-init="stats = content.attributes.stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+            >
+                <dt>Malicious</dt>
+                <dd class="wrap">
+                    <strong style="color: #fa541c">{{content.attributes.stats.malicious}}</strong
+                    >/{{total}}
+                </dd>
+            </dl>
+            <dl
+                class="dl-horizontal"
+                ng-if="content.attributes.stats"
+                ng-init="stats = content.attributes.stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+            >
+                <dt>Suspicious</dt>
+                <dd class="wrap">
+                    <strong style="color: #ffa940">{{content.attributes.stats.suspicious}}</strong
+                    >/{{total}}
+                </dd>
+            </dl>
+            <dl
+                class="dl-horizontal"
+                ng-if="content.attributes.stats"
+                ng-init="stats = content.attributes.stats;
+                         others = stats.type-unsupported + stats.confirmed-timeout + stats.timeout + stats.failure + stats.undetected;
+                         total = others + stats.harmless + stats.malicious + stats.suspicious"
+            >
+                <dt>Undefined</dt>
+                <dd class="wrap">
+                    <strong class="text-info">{{others}}</strong>/{{total}}
+                </dd>
+            </dl>
+            <dl class="dl-horizontal" ng-if="content.attributes.date">
+                <dt>Last analysis date</dt>
+                <dd class="wrap">{{content.attributes.date*1000 | date: 'yyyy-MM-dd HH:mm:ss'}}</dd>
+            </dl>
+            <dl class="dl-horizontal" ng-if="content.attributes.date">
+                <dt>VirusTotal Report</dt>
+                <dd>
+                    <a ng-href="{{'https://www.virustotal.com/gui/file-analysis/'+content.id}}" target="_blank" ng-if="content.id[0] != 'u'"
+                        >https://www.virustotal.com/gui/file-analysis/{{content.id}}</a
+                    >
+                    <a ng-href="{{'https://www.virustotal.com/gui/url/'+content.id.split('-')[1]}}" target="_blank" ng-if="content.id[0] == 'u'"
+                        >https://www.virustotal.com/gui/url/{{content.id.split("-")[1]}}</a
+                    >
+                </dd>
+            </dl>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_urls.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Contacted URLs</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.contacted_urls.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Scanned</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Status</th>
+                    <th scope="col">URL</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="url in content.relations.contacted_urls.data">
+                    <td>
+                        <strong>{{url.attributes.last_analysis_date*1000 | date: 'yyyy-MM-dd'}}</strong>
+                    </td>
+                    <td
+                        ng-init="stats = url.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="url.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{url.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{url.attributes.last_http_response_code || "-"}}</td>
+                    <td>{{url.attributes.url || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_domains.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Contacted Domains</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.contacted_domains.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">Domain</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Created</th>
+                    <th scope="col">Registrar</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="domain in content.relations.contacted_domains.data">
+                    <td>
+                        <strong>{{domain.id}}</strong>
+                    </td>
+                    <td
+                        ng-init="stats = domain.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="domain.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{domain.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td ng-if="domain.attributes.creation_date">{{domain.attributes.creation_date*1000 | date: 'yyyy-MM-dd'}}</td>
+                    <td ng-if="!domain.attributes.creation_date">-</td>
+                    <td>{{domain.attributes.registrar || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.last_serving_ip_address.meta.count > 0">
+        <div class="panel-heading">
+            <strong>Last Serving IP Address</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">IP</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Autonomous System</th>
+                    <th scope="col">Country</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-init="ip = content.relations.last_serving_ip_address.data">
+                    <td>
+                        <strong>{{ip.id}}</strong>
+                    </td>
+                    <td
+                            ng-init="stats = ip.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="ip.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{ip.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{ip.attributes.asn || "-"}}</td>
+                    <td>{{ip.attributes.country || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.relations.contacted_ips.meta.count > 0">
+        <div class="panel-heading row">
+            <div class="col-md-6">
+                <strong>Contacted IP Addresses</strong>
+            </div>
+            <div class="col-md-6 text-right" ng-if="content.relations.contacted_ips.meta.count > 10">
+                (Last 10)
+            </div>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">IP</th>
+                    <th scope="col">Detections</th>
+                    <th scope="col">Autonomous System</th>
+                    <th scope="col">Country</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="ip in content.relations.contacted_ips.data">
+                    <td>
+                        <strong>{{ip.id}}</strong>
+                    </td>
+                    <td
+                        ng-init="stats = ip.attributes.last_analysis_stats; total = stats.harmless + stats.type-unsupported + stats.suspicious + stats.confirmed-timeout + stats.timeout + stats.failure + stats.malicious + stats.undetected"
+                    >
+                        <strong ng-class="ip.attributes.last_analysis_stats.malicious > 0 ? 'text-danger': 'text-success'">
+                            {{ip.attributes.last_analysis_stats.malicious || "0"}}
+                        </strong> / {{total}}
+                    </td>
+                    <td>{{ip.attributes.asn || "-"}}</td>
+                    <td>{{ip.attributes.country || "-"}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-info" ng-if="content.attributes.results">
+        <div class="panel-heading">
+            <strong>Scans</strong>
+        </div>
+        <div class="panel-body">
+            <table class="table table-hover">
+                <thead>
+                    <tr>
+                        <th scope="col">Scanner</th>
+                        <th scope="col">Detected</th>
+                        <th scope="col" ng-if="content.id[0] == 'u'">Result</th>
+                        <th scope="col">Method</th>
+                        <th scope="col" ng-if="content.id[0] != 'u'">Update</th>
+                        <th scope="col" ng-if="content.id[0] != 'u'">Version</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="scanner in content.attributes.results">
+                        <td>
+                            <strong>{{scanner.engine_name}}</strong>
+                        </td>
+                        <td>
+                            <i
+                                ng-class="scanner.category == 'malicious' ? 'text-danger fas fa-bug' : (scanner.category == 'suspicious' ? 'text-warning fas fa-bug' : (scanner.category == 'harmless' ? 'text-success fas fa-check-circle' : 'text-info fas fa-question-circle' ))"
+                            >
+                            </i>
+                        </td>
+                        <td
+                            ng-if="content.id[0] == 'u'"
+                            ng-class="{'text-danger': scanner.category == 'malicious', 'text-warning': scanner.category == 'suspicious', 'text-success': scanner.category == 'harmless', 'text-info': scanner.category == 'failure' && scanner.category == 'undetected' && scanner.category == 'type-unsupported' }"
+                            class="wrap"
+                        >
+                            {{scanner.result || "null"}}
+                        </td>
+                        <td>{{scanner.method || "null"}}</td>
+                        <td ng-if="content.id[0] != 'u'">
+                            {{scanner.engine_update.slice(0,4)+"/"+scanner.engine_update.slice(4,6)+"/"+scanner.engine_update.slice(6,8)}}
+                        </td>
+                        <td ng-if="content.id[0] != 'u'">{{scanner.engine_version || ""}}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
\ No newline at end of file