diff --git a/internal/db/statistics.go b/internal/db/statistics.go
index 708255ff..f1ba7976 100644
--- a/internal/db/statistics.go
+++ b/internal/db/statistics.go
@@ -29,12 +29,9 @@ type TestsSummary struct {
 	Unresolved   []*TestDetails
 	Failed       []*FailedDetails
 
-	AllRequestsNumber        int
-	BlockedRequestsNumber    int
-	BypassedRequestsNumber   int
-	UnresolvedRequestsNumber int
-	FailedRequestsNumber     int
-	ResolvedRequestsNumber   int
+	ReqStats       RequestStats
+	ApiSecReqStats RequestStats
+	AppSecReqStats RequestStats
 
 	UnresolvedRequestsPercentage       float64
 	ResolvedBlockedRequestsPercentage  float64
@@ -74,6 +71,15 @@ type FailedDetails struct {
 	Type        string   `json:"type" validate:"omitempty"`
 }
 
+type RequestStats struct {
+	AllRequestsNumber        int
+	BlockedRequestsNumber    int
+	BypassedRequestsNumber   int
+	UnresolvedRequestsNumber int
+	FailedRequestsNumber     int
+	ResolvedRequestsNumber   int
+}
+
 type Score struct {
 	TruePositive float64
 	TrueNegative float64
@@ -187,34 +193,30 @@ func (db *DB) GetStatistics(ignoreUnresolved, nonBlockedAsPassed bool) *Statisti
 			// If positive set - move to another table (remove from general cases)
 			if isFalsePositive {
 				// False positive - blocked by the WAF (bad behavior, blockedRequests)
-				s.TrueNegativeTests.BlockedRequestsNumber += blockedRequests
+				s.TrueNegativeTests.ReqStats.BlockedRequestsNumber += blockedRequests
 				// True positive - bypassed (good behavior, passedRequests)
-				s.TrueNegativeTests.BypassedRequestsNumber += passedRequests
-				s.TrueNegativeTests.UnresolvedRequestsNumber += unresolvedRequests
-				s.TrueNegativeTests.FailedRequestsNumber += failedRequests
+				s.TrueNegativeTests.ReqStats.BypassedRequestsNumber += passedRequests
+				s.TrueNegativeTests.ReqStats.UnresolvedRequestsNumber += unresolvedRequests
+				s.TrueNegativeTests.ReqStats.FailedRequestsNumber += failedRequests
 
 				passedRequestsPercentage := CalculatePercentage(passedRequests, totalResolvedRequests)
 				row.Percentage = passedRequestsPercentage
 
 				s.TrueNegativeTests.SummaryTable = append(s.TrueNegativeTests.SummaryTable, row)
 			} else {
-				s.TruePositiveTests.BlockedRequestsNumber += blockedRequests
-				s.TruePositiveTests.BypassedRequestsNumber += passedRequests
-				s.TruePositiveTests.UnresolvedRequestsNumber += unresolvedRequests
-				s.TruePositiveTests.FailedRequestsNumber += failedRequests
+				s.TruePositiveTests.ReqStats.BlockedRequestsNumber += blockedRequests
+				s.TruePositiveTests.ReqStats.BypassedRequestsNumber += passedRequests
+				s.TruePositiveTests.ReqStats.UnresolvedRequestsNumber += unresolvedRequests
+				s.TruePositiveTests.ReqStats.FailedRequestsNumber += failedRequests
 
 				blockedRequestsPercentage := CalculatePercentage(blockedRequests, totalResolvedRequests)
 				row.Percentage = blockedRequestsPercentage
 
 				s.TruePositiveTests.SummaryTable = append(s.TruePositiveTests.SummaryTable, row)
-
 			}
 		}
 	}
 
-	calculateTestsSummaryStat(&s.TruePositiveTests)
-	calculateTestsSummaryStat(&s.TrueNegativeTests)
-
 	for _, blockedTest := range db.blockedTests {
 		sort.Strings(blockedTest.AdditionalInfo)
 
@@ -231,8 +233,20 @@ func (db *DB) GetStatistics(ignoreUnresolved, nonBlockedAsPassed bool) *Statisti
 
 		if isFalsePositiveTest(blockedTest.Set) {
 			s.TrueNegativeTests.Blocked = append(s.TrueNegativeTests.Blocked, testDetails)
+
+			if isApiTest(blockedTest.Set) {
+				s.TrueNegativeTests.ApiSecReqStats.BlockedRequestsNumber += 1
+			} else {
+				s.TrueNegativeTests.AppSecReqStats.BlockedRequestsNumber += 1
+			}
 		} else {
 			s.TruePositiveTests.Blocked = append(s.TruePositiveTests.Blocked, testDetails)
+
+			if isApiTest(blockedTest.Set) {
+				s.TruePositiveTests.ApiSecReqStats.BlockedRequestsNumber += 1
+			} else {
+				s.TruePositiveTests.AppSecReqStats.BlockedRequestsNumber += 1
+			}
 		}
 	}
 
@@ -252,8 +266,20 @@ func (db *DB) GetStatistics(ignoreUnresolved, nonBlockedAsPassed bool) *Statisti
 
 		if isFalsePositiveTest(passedTest.Set) {
 			s.TrueNegativeTests.Bypasses = append(s.TrueNegativeTests.Bypasses, testDetails)
+
+			if isApiTest(passedTest.Set) {
+				s.TrueNegativeTests.ApiSecReqStats.BypassedRequestsNumber += 1
+			} else {
+				s.TrueNegativeTests.AppSecReqStats.BypassedRequestsNumber += 1
+			}
 		} else {
 			s.TruePositiveTests.Bypasses = append(s.TruePositiveTests.Bypasses, testDetails)
+
+			if isApiTest(passedTest.Set) {
+				s.TruePositiveTests.ApiSecReqStats.BypassedRequestsNumber += 1
+			} else {
+				s.TruePositiveTests.AppSecReqStats.BypassedRequestsNumber += 1
+			}
 		}
 	}
 
@@ -274,14 +300,38 @@ func (db *DB) GetStatistics(ignoreUnresolved, nonBlockedAsPassed bool) *Statisti
 		if ignoreUnresolved || nonBlockedAsPassed {
 			if isFalsePositiveTest(unresolvedTest.Set) {
 				s.TrueNegativeTests.Blocked = append(s.TrueNegativeTests.Blocked, testDetails)
+
+				if isApiTest(unresolvedTest.Set) {
+					s.TrueNegativeTests.ApiSecReqStats.BlockedRequestsNumber += 1
+				} else {
+					s.TrueNegativeTests.AppSecReqStats.BlockedRequestsNumber += 1
+				}
 			} else {
 				s.TruePositiveTests.Bypasses = append(s.TruePositiveTests.Bypasses, testDetails)
+
+				if isApiTest(unresolvedTest.Set) {
+					s.TruePositiveTests.ApiSecReqStats.BypassedRequestsNumber += 1
+				} else {
+					s.TruePositiveTests.AppSecReqStats.BypassedRequestsNumber += 1
+				}
 			}
 		} else {
 			if isFalsePositiveTest(unresolvedTest.Set) {
 				s.TrueNegativeTests.Unresolved = append(s.TrueNegativeTests.Unresolved, testDetails)
+
+				if isApiTest(unresolvedTest.Set) {
+					s.TrueNegativeTests.ApiSecReqStats.UnresolvedRequestsNumber += 1
+				} else {
+					s.TrueNegativeTests.AppSecReqStats.UnresolvedRequestsNumber += 1
+				}
 			} else {
 				s.TruePositiveTests.Unresolved = append(s.TruePositiveTests.Unresolved, testDetails)
+
+				if isApiTest(unresolvedTest.Set) {
+					s.TruePositiveTests.ApiSecReqStats.UnresolvedRequestsNumber += 1
+				} else {
+					s.TruePositiveTests.AppSecReqStats.UnresolvedRequestsNumber += 1
+				}
 			}
 		}
 	}
@@ -299,8 +349,20 @@ func (db *DB) GetStatistics(ignoreUnresolved, nonBlockedAsPassed bool) *Statisti
 
 		if isFalsePositiveTest(failedTest.Set) {
 			s.TrueNegativeTests.Failed = append(s.TrueNegativeTests.Failed, testDetails)
+
+			if isApiTest(failedTest.Set) {
+				s.TrueNegativeTests.ApiSecReqStats.FailedRequestsNumber += 1
+			} else {
+				s.TrueNegativeTests.AppSecReqStats.FailedRequestsNumber += 1
+			}
 		} else {
 			s.TruePositiveTests.Failed = append(s.TruePositiveTests.Failed, testDetails)
+
+			if isApiTest(failedTest.Set) {
+				s.TruePositiveTests.ApiSecReqStats.FailedRequestsNumber += 1
+			} else {
+				s.TruePositiveTests.AppSecReqStats.FailedRequestsNumber += 1
+			}
 		}
 	}
 
@@ -320,52 +382,23 @@ func (db *DB) GetStatistics(ignoreUnresolved, nonBlockedAsPassed bool) *Statisti
 		s.Paths = paths
 	}
 
-	var apiSecTruePosBlockedNum int
-	var apiSecTruePosNum int
-	var appSecTruePosBlockedNum int
-	var appSecTruePosNum int
-
-	for _, test := range s.TruePositiveTests.Blocked {
-		if isApiTest(test.TestSet) {
-			apiSecTruePosNum++
-			apiSecTruePosBlockedNum++
-		} else {
-			appSecTruePosNum++
-			appSecTruePosBlockedNum++
-		}
-	}
-	for _, test := range s.TruePositiveTests.Bypasses {
-		if isApiTest(test.TestSet) {
-			apiSecTruePosNum++
-		} else {
-			appSecTruePosNum++
-		}
-	}
-
-	var apiSecTrueNegBypassNum int
-	var apiSecTrueNegNum int
-	var appSecTrueNegBypassNum int
-	var appSecTrueNegNum int
-
-	for _, test := range s.TrueNegativeTests.Bypasses {
-		if isApiTest(test.TestSet) {
-			apiSecTrueNegNum++
-			apiSecTrueNegBypassNum++
-		} else {
-			appSecTrueNegNum++
-			appSecTrueNegBypassNum++
-		}
-	}
-	for _, test := range s.TrueNegativeTests.Blocked {
-		if isApiTest(test.TestSet) {
-			apiSecTrueNegNum++
-		} else {
-			appSecTrueNegNum++
-		}
-	}
+	calculateTestsSummaryStat(&s.TruePositiveTests)
+	calculateTestsSummaryStat(&s.TrueNegativeTests)
 
-	calculateScorePercentage(&s.Score.ApiSec, apiSecTruePosBlockedNum, apiSecTruePosNum, apiSecTrueNegBypassNum, apiSecTrueNegNum)
-	calculateScorePercentage(&s.Score.AppSec, appSecTruePosBlockedNum, appSecTruePosNum, appSecTrueNegBypassNum, appSecTrueNegNum)
+	calculateScorePercentage(
+		&s.Score.ApiSec,
+		s.TruePositiveTests.ApiSecReqStats.BlockedRequestsNumber,
+		s.TruePositiveTests.ApiSecReqStats.ResolvedRequestsNumber,
+		s.TrueNegativeTests.ApiSecReqStats.BypassedRequestsNumber,
+		s.TrueNegativeTests.ApiSecReqStats.ResolvedRequestsNumber,
+	)
+	calculateScorePercentage(
+		&s.Score.AppSec,
+		s.TruePositiveTests.AppSecReqStats.BlockedRequestsNumber,
+		s.TruePositiveTests.AppSecReqStats.ResolvedRequestsNumber,
+		s.TrueNegativeTests.AppSecReqStats.BypassedRequestsNumber,
+		s.TrueNegativeTests.AppSecReqStats.ResolvedRequestsNumber,
+	)
 
 	var divider int
 	var sum float64
@@ -389,18 +422,37 @@ func (db *DB) GetStatistics(ignoreUnresolved, nonBlockedAsPassed bool) *Statisti
 }
 
 func calculateTestsSummaryStat(s *TestsSummary) {
-	s.AllRequestsNumber = s.BlockedRequestsNumber +
-		s.BypassedRequestsNumber +
-		s.UnresolvedRequestsNumber +
-		s.FailedRequestsNumber
-
-	s.ResolvedRequestsNumber = s.BlockedRequestsNumber +
-		s.BypassedRequestsNumber
-
-	s.UnresolvedRequestsPercentage = CalculatePercentage(s.UnresolvedRequestsNumber, s.AllRequestsNumber)
-	s.ResolvedBlockedRequestsPercentage = CalculatePercentage(s.BlockedRequestsNumber, s.ResolvedRequestsNumber)
-	s.ResolvedBypassedRequestsPercentage = CalculatePercentage(s.BypassedRequestsNumber, s.ResolvedRequestsNumber)
-	s.FailedRequestsPercentage = CalculatePercentage(s.FailedRequestsNumber, s.AllRequestsNumber)
+	// All requests stat
+	s.ReqStats.AllRequestsNumber = s.ReqStats.BlockedRequestsNumber +
+		s.ReqStats.BypassedRequestsNumber +
+		s.ReqStats.UnresolvedRequestsNumber +
+		s.ReqStats.FailedRequestsNumber
+
+	s.ReqStats.ResolvedRequestsNumber = s.ReqStats.BlockedRequestsNumber +
+		s.ReqStats.BypassedRequestsNumber
+
+	// ApiSec requests stat
+	s.ApiSecReqStats.AllRequestsNumber = s.ApiSecReqStats.BlockedRequestsNumber +
+		s.ApiSecReqStats.BypassedRequestsNumber +
+		s.ApiSecReqStats.UnresolvedRequestsNumber +
+		s.ApiSecReqStats.FailedRequestsNumber
+
+	s.ApiSecReqStats.ResolvedRequestsNumber = s.ApiSecReqStats.BlockedRequestsNumber +
+		s.ApiSecReqStats.BypassedRequestsNumber
+
+	// AppSec requests stat
+	s.AppSecReqStats.AllRequestsNumber = s.AppSecReqStats.BlockedRequestsNumber +
+		s.AppSecReqStats.BypassedRequestsNumber +
+		s.AppSecReqStats.UnresolvedRequestsNumber +
+		s.AppSecReqStats.FailedRequestsNumber
+
+	s.AppSecReqStats.ResolvedRequestsNumber = s.AppSecReqStats.BlockedRequestsNumber +
+		s.AppSecReqStats.BypassedRequestsNumber
+
+	s.UnresolvedRequestsPercentage = CalculatePercentage(s.ReqStats.UnresolvedRequestsNumber, s.ReqStats.AllRequestsNumber)
+	s.ResolvedBlockedRequestsPercentage = CalculatePercentage(s.ReqStats.BlockedRequestsNumber, s.ReqStats.ResolvedRequestsNumber)
+	s.ResolvedBypassedRequestsPercentage = CalculatePercentage(s.ReqStats.BypassedRequestsNumber, s.ReqStats.ResolvedRequestsNumber)
+	s.FailedRequestsPercentage = CalculatePercentage(s.ReqStats.FailedRequestsNumber, s.ReqStats.AllRequestsNumber)
 }
 
 func calculateScorePercentage(s *Score, truePosBlockedNum, truePosNum, trueNegBypassNum, trueNegNum int) {
diff --git a/internal/db/statistics_test.go b/internal/db/statistics_test.go
index fe3fdd14..72d112ce 100644
--- a/internal/db/statistics_test.go
+++ b/internal/db/statistics_test.go
@@ -165,22 +165,22 @@ func testPropertyNotPanics(db *DB, ignoreUnresolved, nonBlockedAsPassed bool) bo
 func testPropertyOnlyPositiveNumberValues(db *DB, ignoreUnresolved, nonBlockedAsPassed bool) bool {
 	stat := db.GetStatistics(ignoreUnresolved, nonBlockedAsPassed)
 
-	if stat.TruePositiveTests.AllRequestsNumber < 0 ||
-		stat.TruePositiveTests.BlockedRequestsNumber < 0 ||
-		stat.TruePositiveTests.BypassedRequestsNumber < 0 ||
-		stat.TruePositiveTests.UnresolvedRequestsNumber < 0 ||
-		stat.TruePositiveTests.FailedRequestsNumber < 0 ||
-		stat.TruePositiveTests.ResolvedRequestsNumber < 0 ||
+	if stat.TruePositiveTests.ReqStats.AllRequestsNumber < 0 ||
+		stat.TruePositiveTests.ReqStats.BlockedRequestsNumber < 0 ||
+		stat.TruePositiveTests.ReqStats.BypassedRequestsNumber < 0 ||
+		stat.TruePositiveTests.ReqStats.UnresolvedRequestsNumber < 0 ||
+		stat.TruePositiveTests.ReqStats.FailedRequestsNumber < 0 ||
+		stat.TruePositiveTests.ReqStats.ResolvedRequestsNumber < 0 ||
 		stat.TruePositiveTests.UnresolvedRequestsPercentage < 0 ||
 		stat.TruePositiveTests.ResolvedBlockedRequestsPercentage < 0 ||
 		stat.TruePositiveTests.ResolvedBypassedRequestsPercentage < 0 ||
 		stat.TruePositiveTests.FailedRequestsPercentage < 0 ||
-		stat.TrueNegativeTests.AllRequestsNumber < 0 ||
-		stat.TrueNegativeTests.BlockedRequestsNumber < 0 ||
-		stat.TrueNegativeTests.BypassedRequestsNumber < 0 ||
-		stat.TrueNegativeTests.UnresolvedRequestsNumber < 0 ||
-		stat.TrueNegativeTests.FailedRequestsNumber < 0 ||
-		stat.TrueNegativeTests.ResolvedRequestsNumber < 0 ||
+		stat.TrueNegativeTests.ReqStats.AllRequestsNumber < 0 ||
+		stat.TrueNegativeTests.ReqStats.BlockedRequestsNumber < 0 ||
+		stat.TrueNegativeTests.ReqStats.BypassedRequestsNumber < 0 ||
+		stat.TrueNegativeTests.ReqStats.UnresolvedRequestsNumber < 0 ||
+		stat.TrueNegativeTests.ReqStats.FailedRequestsNumber < 0 ||
+		stat.TrueNegativeTests.ReqStats.ResolvedRequestsNumber < 0 ||
 		stat.TrueNegativeTests.UnresolvedRequestsPercentage < 0 ||
 		stat.TrueNegativeTests.ResolvedBlockedRequestsPercentage < 0 ||
 		stat.TrueNegativeTests.ResolvedBypassedRequestsPercentage < 0 ||
@@ -226,12 +226,12 @@ func testPropertyCorrectStatValues(db *DB, ignoreUnresolved, nonBlockedAsPassed
 	counters["true-positive"]["resolved"] = counters["true-positive"]["blocked"] +
 		counters["true-positive"]["bypassed"]
 
-	if counters["true-positive"]["all"] != stat.TruePositiveTests.AllRequestsNumber ||
-		counters["true-positive"]["blocked"] != stat.TruePositiveTests.BlockedRequestsNumber ||
-		counters["true-positive"]["bypassed"] != stat.TruePositiveTests.BypassedRequestsNumber ||
-		counters["true-positive"]["unresolved"] != stat.TruePositiveTests.UnresolvedRequestsNumber ||
-		counters["true-positive"]["failed"] != stat.TruePositiveTests.FailedRequestsNumber ||
-		counters["true-positive"]["resolved"] != stat.TruePositiveTests.ResolvedRequestsNumber {
+	if counters["true-positive"]["all"] != stat.TruePositiveTests.ReqStats.AllRequestsNumber ||
+		counters["true-positive"]["blocked"] != stat.TruePositiveTests.ReqStats.BlockedRequestsNumber ||
+		counters["true-positive"]["bypassed"] != stat.TruePositiveTests.ReqStats.BypassedRequestsNumber ||
+		counters["true-positive"]["unresolved"] != stat.TruePositiveTests.ReqStats.UnresolvedRequestsNumber ||
+		counters["true-positive"]["failed"] != stat.TruePositiveTests.ReqStats.FailedRequestsNumber ||
+		counters["true-positive"]["resolved"] != stat.TruePositiveTests.ReqStats.ResolvedRequestsNumber {
 		return false
 	}
 
@@ -251,12 +251,12 @@ func testPropertyCorrectStatValues(db *DB, ignoreUnresolved, nonBlockedAsPassed
 	counters["true-negative"]["resolved"] = counters["true-negative"]["blocked"] +
 		counters["true-negative"]["bypassed"]
 
-	if counters["true-negative"]["all"] != stat.TrueNegativeTests.AllRequestsNumber ||
-		counters["true-negative"]["blocked"] != stat.TrueNegativeTests.BlockedRequestsNumber ||
-		counters["true-negative"]["bypassed"] != stat.TrueNegativeTests.BypassedRequestsNumber ||
-		counters["true-negative"]["unresolved"] != stat.TrueNegativeTests.UnresolvedRequestsNumber ||
-		counters["true-negative"]["failed"] != stat.TrueNegativeTests.FailedRequestsNumber ||
-		counters["true-negative"]["resolved"] != stat.TrueNegativeTests.ResolvedRequestsNumber {
+	if counters["true-negative"]["all"] != stat.TrueNegativeTests.ReqStats.AllRequestsNumber ||
+		counters["true-negative"]["blocked"] != stat.TrueNegativeTests.ReqStats.BlockedRequestsNumber ||
+		counters["true-negative"]["bypassed"] != stat.TrueNegativeTests.ReqStats.BypassedRequestsNumber ||
+		counters["true-negative"]["unresolved"] != stat.TrueNegativeTests.ReqStats.UnresolvedRequestsNumber ||
+		counters["true-negative"]["failed"] != stat.TrueNegativeTests.ReqStats.FailedRequestsNumber ||
+		counters["true-negative"]["resolved"] != stat.TrueNegativeTests.ReqStats.ResolvedRequestsNumber {
 		return false
 	}
 
@@ -593,6 +593,8 @@ func TestStatisticsCalculation(t *testing.T) {
 			}
 		}
 
+		fmt.Println(tc)
+
 		if stat.Score.ApiSec.TruePositive != apiSecTruePosPercentage {
 			t.Fatalf("ApiSec.TruePositive: want %#v, got %#v", apiSecTruePosPercentage, stat.Score.ApiSec.TruePositive)
 		}
diff --git a/internal/report/console.go b/internal/report/console.go
index 7dfa740b..ffc47577 100644
--- a/internal/report/console.go
+++ b/internal/report/console.go
@@ -87,30 +87,30 @@ func printConsoleReportTable(
 		fmt.Sprintf("Project Name:\n%s", wafName),
 		fmt.Sprintf("True-Positive Score:\n%.2f%%", s.TruePositiveTests.ResolvedBlockedRequestsPercentage),
 		fmt.Sprintf("Blocked (Resolved):\n%d/%d (%.2f%%)",
-			s.TruePositiveTests.BlockedRequestsNumber,
-			s.TruePositiveTests.ResolvedRequestsNumber,
+			s.TruePositiveTests.ReqStats.BlockedRequestsNumber,
+			s.TruePositiveTests.ReqStats.ResolvedRequestsNumber,
 			s.TruePositiveTests.ResolvedBlockedRequestsPercentage,
 		),
 		fmt.Sprintf("Bypassed (Resolved):\n%d/%d (%.2f%%)",
-			s.TruePositiveTests.BypassedRequestsNumber,
-			s.TruePositiveTests.ResolvedRequestsNumber,
+			s.TruePositiveTests.ReqStats.BypassedRequestsNumber,
+			s.TruePositiveTests.ReqStats.ResolvedRequestsNumber,
 			s.TruePositiveTests.ResolvedBypassedRequestsPercentage,
 		),
 	}
 	if !ignoreUnresolved {
 		footerNegativeTests = append(footerNegativeTests,
 			fmt.Sprintf("Unresolved (Sent):\n%d/%d (%.2f%%)",
-				s.TruePositiveTests.UnresolvedRequestsNumber,
-				s.TruePositiveTests.AllRequestsNumber,
+				s.TruePositiveTests.ReqStats.UnresolvedRequestsNumber,
+				s.TruePositiveTests.ReqStats.AllRequestsNumber,
 				s.TruePositiveTests.UnresolvedRequestsPercentage,
 			),
 		)
 	}
 	footerNegativeTests = append(footerNegativeTests,
-		fmt.Sprintf("Total Sent:\n%d", s.TruePositiveTests.AllRequestsNumber),
+		fmt.Sprintf("Total Sent:\n%d", s.TruePositiveTests.ReqStats.AllRequestsNumber),
 		fmt.Sprintf("Failed (Total):\n%d/%d (%.2f%%)",
-			s.TruePositiveTests.FailedRequestsNumber,
-			s.TruePositiveTests.AllRequestsNumber,
+			s.TruePositiveTests.ReqStats.FailedRequestsNumber,
+			s.TruePositiveTests.ReqStats.AllRequestsNumber,
 			s.TruePositiveTests.FailedRequestsPercentage,
 		),
 	)
@@ -150,30 +150,30 @@ func printConsoleReportTable(
 		fmt.Sprintf("Project Name:\n%s", wafName),
 		fmt.Sprintf("True-Negative Score:\n%.2f%%", s.TrueNegativeTests.ResolvedBypassedRequestsPercentage),
 		fmt.Sprintf("Blocked (Resolved):\n%d/%d (%.2f%%)",
-			s.TrueNegativeTests.BlockedRequestsNumber,
-			s.TrueNegativeTests.ResolvedRequestsNumber,
+			s.TrueNegativeTests.ReqStats.BlockedRequestsNumber,
+			s.TrueNegativeTests.ReqStats.ResolvedRequestsNumber,
 			s.TrueNegativeTests.ResolvedBlockedRequestsPercentage,
 		),
 		fmt.Sprintf("Bypassed (Resolved):\n%d/%d (%.2f%%)",
-			s.TrueNegativeTests.BypassedRequestsNumber,
-			s.TrueNegativeTests.ResolvedRequestsNumber,
+			s.TrueNegativeTests.ReqStats.BypassedRequestsNumber,
+			s.TrueNegativeTests.ReqStats.ResolvedRequestsNumber,
 			s.TrueNegativeTests.ResolvedBypassedRequestsPercentage,
 		),
 	}
 	if !ignoreUnresolved {
 		footerPositiveTests = append(footerPositiveTests,
 			fmt.Sprintf("Unresolved (Sent):\n%d/%d (%.2f%%)",
-				s.TrueNegativeTests.UnresolvedRequestsNumber,
-				s.TrueNegativeTests.AllRequestsNumber,
+				s.TrueNegativeTests.ReqStats.UnresolvedRequestsNumber,
+				s.TrueNegativeTests.ReqStats.AllRequestsNumber,
 				s.TrueNegativeTests.UnresolvedRequestsPercentage,
 			),
 		)
 	}
 	footerPositiveTests = append(footerPositiveTests,
-		fmt.Sprintf("Total Sent:\n%d", s.TrueNegativeTests.AllRequestsNumber),
+		fmt.Sprintf("Total Sent:\n%d", s.TrueNegativeTests.ReqStats.AllRequestsNumber),
 		fmt.Sprintf("Failed (Total):\n%d/%d (%.2f%%)",
-			s.TrueNegativeTests.FailedRequestsNumber,
-			s.TrueNegativeTests.AllRequestsNumber,
+			s.TrueNegativeTests.ReqStats.FailedRequestsNumber,
+			s.TrueNegativeTests.ReqStats.AllRequestsNumber,
 			s.TrueNegativeTests.FailedRequestsPercentage,
 		),
 	)
@@ -258,14 +258,32 @@ func printConsoleReportJson(
 
 	if len(s.TruePositiveTests.SummaryTable) != 0 {
 		report.TruePositiveTests = &testsInfo{
-			Score:           s.TruePositiveTests.ResolvedBlockedRequestsPercentage,
-			TotalSent:       s.TruePositiveTests.AllRequestsNumber,
-			ResolvedTests:   s.TruePositiveTests.ResolvedRequestsNumber,
-			BlockedTests:    s.TruePositiveTests.BlockedRequestsNumber,
-			BypassedTests:   s.TruePositiveTests.BypassedRequestsNumber,
-			UnresolvedTests: s.TruePositiveTests.UnresolvedRequestsNumber,
-			FailedTests:     s.TruePositiveTests.FailedRequestsNumber,
-			TestSets:        make(testSets),
+			Score: s.TruePositiveTests.ResolvedBlockedRequestsPercentage,
+			Summary: requestStats{
+				TotalSent:       s.TruePositiveTests.ReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TruePositiveTests.ReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TruePositiveTests.ReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TruePositiveTests.ReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TruePositiveTests.ReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TruePositiveTests.ReqStats.FailedRequestsNumber,
+			},
+			ApiSecStat: requestStats{
+				TotalSent:       s.TruePositiveTests.ApiSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TruePositiveTests.ApiSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TruePositiveTests.ApiSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TruePositiveTests.ApiSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TruePositiveTests.ApiSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TruePositiveTests.ApiSecReqStats.FailedRequestsNumber,
+			},
+			AppSecStat: requestStats{
+				TotalSent:       s.TruePositiveTests.AppSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TruePositiveTests.AppSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TruePositiveTests.AppSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TruePositiveTests.AppSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TruePositiveTests.AppSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TruePositiveTests.AppSecReqStats.FailedRequestsNumber,
+			},
+			TestSets: make(testSets),
 		}
 		for _, row := range s.TruePositiveTests.SummaryTable {
 			if report.TruePositiveTests.TestSets[row.TestSet] == nil {
@@ -284,14 +302,32 @@ func printConsoleReportJson(
 
 	if len(s.TrueNegativeTests.SummaryTable) != 0 {
 		report.TrueNegativeTests = &testsInfo{
-			Score:           s.TrueNegativeTests.ResolvedBypassedRequestsPercentage,
-			TotalSent:       s.TrueNegativeTests.AllRequestsNumber,
-			ResolvedTests:   s.TrueNegativeTests.ResolvedRequestsNumber,
-			BlockedTests:    s.TrueNegativeTests.BlockedRequestsNumber,
-			BypassedTests:   s.TrueNegativeTests.BypassedRequestsNumber,
-			UnresolvedTests: s.TrueNegativeTests.UnresolvedRequestsNumber,
-			FailedTests:     s.TrueNegativeTests.FailedRequestsNumber,
-			TestSets:        make(testSets),
+			Score: s.TrueNegativeTests.ResolvedBypassedRequestsPercentage,
+			Summary: requestStats{
+				TotalSent:       s.TrueNegativeTests.ReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TrueNegativeTests.ReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TrueNegativeTests.ReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TrueNegativeTests.ReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TrueNegativeTests.ReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TrueNegativeTests.ReqStats.FailedRequestsNumber,
+			},
+			ApiSecStat: requestStats{
+				TotalSent:       s.TrueNegativeTests.ApiSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TrueNegativeTests.ApiSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TrueNegativeTests.ApiSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TrueNegativeTests.ApiSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TrueNegativeTests.ApiSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TrueNegativeTests.ApiSecReqStats.FailedRequestsNumber,
+			},
+			AppSecStat: requestStats{
+				TotalSent:       s.TrueNegativeTests.AppSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TrueNegativeTests.AppSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TrueNegativeTests.AppSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TrueNegativeTests.AppSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TrueNegativeTests.AppSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TrueNegativeTests.AppSecReqStats.FailedRequestsNumber,
+			},
+			TestSets: make(testSets),
 		}
 		for _, row := range s.TrueNegativeTests.SummaryTable {
 			if report.TrueNegativeTests.TestSets[row.TestSet] == nil {
diff --git a/internal/report/html.go b/internal/report/html.go
index 035cf060..db8e1318 100644
--- a/internal/report/html.go
+++ b/internal/report/html.go
@@ -396,18 +396,18 @@ func prepareHTMLFullReport(
 	data.ScannedPaths = s.Paths
 
 	data.TruePositiveTests.Percentage = s.TruePositiveTests.ResolvedBlockedRequestsPercentage
-	data.TruePositiveTests.TotalSent = s.TruePositiveTests.AllRequestsNumber
-	data.TruePositiveTests.BlockedRequestsNumber = s.TruePositiveTests.BlockedRequestsNumber
-	data.TruePositiveTests.BypassedRequestsNumber = s.TruePositiveTests.BypassedRequestsNumber
-	data.TruePositiveTests.UnresolvedRequestsNumber = s.TruePositiveTests.UnresolvedRequestsNumber
-	data.TruePositiveTests.FailedRequestsNumber = s.TruePositiveTests.FailedRequestsNumber
+	data.TruePositiveTests.TotalSent = s.TruePositiveTests.ReqStats.AllRequestsNumber
+	data.TruePositiveTests.BlockedRequestsNumber = s.TruePositiveTests.ReqStats.BlockedRequestsNumber
+	data.TruePositiveTests.BypassedRequestsNumber = s.TruePositiveTests.ReqStats.BypassedRequestsNumber
+	data.TruePositiveTests.UnresolvedRequestsNumber = s.TruePositiveTests.ReqStats.UnresolvedRequestsNumber
+	data.TruePositiveTests.FailedRequestsNumber = s.TruePositiveTests.ReqStats.FailedRequestsNumber
 
 	data.TrueNegativeTests.Percentage = s.TrueNegativeTests.ResolvedBypassedRequestsPercentage
-	data.TrueNegativeTests.TotalSent = s.TrueNegativeTests.AllRequestsNumber
-	data.TrueNegativeTests.BlockedRequestsNumber = s.TrueNegativeTests.BlockedRequestsNumber
-	data.TrueNegativeTests.BypassedRequestsNumber = s.TrueNegativeTests.BypassedRequestsNumber
-	data.TrueNegativeTests.UnresolvedRequestsNumber = s.TrueNegativeTests.UnresolvedRequestsNumber
-	data.TrueNegativeTests.FailedRequestsNumber = s.TrueNegativeTests.FailedRequestsNumber
+	data.TrueNegativeTests.TotalSent = s.TrueNegativeTests.ReqStats.AllRequestsNumber
+	data.TrueNegativeTests.BlockedRequestsNumber = s.TrueNegativeTests.ReqStats.BlockedRequestsNumber
+	data.TrueNegativeTests.BypassedRequestsNumber = s.TrueNegativeTests.ReqStats.BypassedRequestsNumber
+	data.TrueNegativeTests.UnresolvedRequestsNumber = s.TrueNegativeTests.ReqStats.UnresolvedRequestsNumber
+	data.TrueNegativeTests.FailedRequestsNumber = s.TrueNegativeTests.ReqStats.FailedRequestsNumber
 
 	data.TotalSent = data.TruePositiveTests.TotalSent + data.TrueNegativeTests.TotalSent
 	data.BlockedRequestsNumber = data.TruePositiveTests.BlockedRequestsNumber + data.TrueNegativeTests.BlockedRequestsNumber
diff --git a/internal/report/json.go b/internal/report/json.go
index c3cefebb..a5dbd41a 100644
--- a/internal/report/json.go
+++ b/internal/report/json.go
@@ -31,14 +31,22 @@ type jsonReport struct {
 }
 
 type testsInfo struct {
-	Score           float64  `json:"score"`
-	TotalSent       int      `json:"total_sent"`
-	ResolvedTests   int      `json:"resolved_tests"`
-	BlockedTests    int      `json:"blocked_tests"`
-	BypassedTests   int      `json:"bypassed_tests"`
-	UnresolvedTests int      `json:"unresolved_tests"`
-	FailedTests     int      `json:"failed_tests"`
-	TestSets        testSets `json:"test_sets"`
+	Score float64 `json:"score"`
+
+	Summary    requestStats `json:"summary"`
+	ApiSecStat requestStats `json:"api_sec"`
+	AppSecStat requestStats `json:"app_sec"`
+
+	TestSets testSets `json:"test_sets"`
+}
+
+type requestStats struct {
+	TotalSent       int `json:"total_sent"`
+	ResolvedTests   int `json:"resolved_tests"`
+	BlockedTests    int `json:"blocked_tests"`
+	BypassedTests   int `json:"bypassed_tests"`
+	UnresolvedTests int `json:"unresolved_tests"`
+	FailedTests     int `json:"failed_tests"`
 }
 
 type testSets map[string]testCases
@@ -100,14 +108,32 @@ func printFullReportToJson(
 
 	if len(s.TruePositiveTests.SummaryTable) != 0 {
 		report.Summary.TruePositiveTests = &testsInfo{
-			Score:           s.TruePositiveTests.ResolvedBlockedRequestsPercentage,
-			TotalSent:       s.TruePositiveTests.AllRequestsNumber,
-			ResolvedTests:   s.TruePositiveTests.ResolvedRequestsNumber,
-			BlockedTests:    s.TruePositiveTests.BlockedRequestsNumber,
-			BypassedTests:   s.TruePositiveTests.BypassedRequestsNumber,
-			UnresolvedTests: s.TruePositiveTests.UnresolvedRequestsNumber,
-			FailedTests:     s.TruePositiveTests.FailedRequestsNumber,
-			TestSets:        make(testSets),
+			Score: s.TruePositiveTests.ResolvedBlockedRequestsPercentage,
+			Summary: requestStats{
+				TotalSent:       s.TruePositiveTests.ReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TruePositiveTests.ReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TruePositiveTests.ReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TruePositiveTests.ReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TruePositiveTests.ReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TruePositiveTests.ReqStats.FailedRequestsNumber,
+			},
+			ApiSecStat: requestStats{
+				TotalSent:       s.TruePositiveTests.ApiSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TruePositiveTests.ApiSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TruePositiveTests.ApiSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TruePositiveTests.ApiSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TruePositiveTests.ApiSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TruePositiveTests.ApiSecReqStats.FailedRequestsNumber,
+			},
+			AppSecStat: requestStats{
+				TotalSent:       s.TruePositiveTests.AppSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TruePositiveTests.AppSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TruePositiveTests.AppSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TruePositiveTests.AppSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TruePositiveTests.AppSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TruePositiveTests.AppSecReqStats.FailedRequestsNumber,
+			},
+			TestSets: make(testSets),
 		}
 		for _, row := range s.TruePositiveTests.SummaryTable {
 			if report.Summary.TruePositiveTests.TestSets[row.TestSet] == nil {
@@ -126,14 +152,32 @@ func printFullReportToJson(
 
 	if len(s.TrueNegativeTests.SummaryTable) != 0 {
 		report.Summary.TrueNegativeTests = &testsInfo{
-			Score:           s.TrueNegativeTests.ResolvedBypassedRequestsPercentage,
-			TotalSent:       s.TrueNegativeTests.AllRequestsNumber,
-			ResolvedTests:   s.TrueNegativeTests.ResolvedRequestsNumber,
-			BlockedTests:    s.TrueNegativeTests.BlockedRequestsNumber,
-			BypassedTests:   s.TrueNegativeTests.BypassedRequestsNumber,
-			UnresolvedTests: s.TrueNegativeTests.UnresolvedRequestsNumber,
-			FailedTests:     s.TrueNegativeTests.FailedRequestsNumber,
-			TestSets:        make(testSets),
+			Score: s.TrueNegativeTests.ResolvedBypassedRequestsPercentage,
+			Summary: requestStats{
+				TotalSent:       s.TrueNegativeTests.ReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TrueNegativeTests.ReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TrueNegativeTests.ReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TrueNegativeTests.ReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TrueNegativeTests.ReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TrueNegativeTests.ReqStats.FailedRequestsNumber,
+			},
+			ApiSecStat: requestStats{
+				TotalSent:       s.TrueNegativeTests.ApiSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TrueNegativeTests.ApiSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TrueNegativeTests.ApiSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TrueNegativeTests.ApiSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TrueNegativeTests.ApiSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TrueNegativeTests.ApiSecReqStats.FailedRequestsNumber,
+			},
+			AppSecStat: requestStats{
+				TotalSent:       s.TrueNegativeTests.AppSecReqStats.AllRequestsNumber,
+				ResolvedTests:   s.TrueNegativeTests.AppSecReqStats.ResolvedRequestsNumber,
+				BlockedTests:    s.TrueNegativeTests.AppSecReqStats.BlockedRequestsNumber,
+				BypassedTests:   s.TrueNegativeTests.AppSecReqStats.BypassedRequestsNumber,
+				UnresolvedTests: s.TrueNegativeTests.AppSecReqStats.UnresolvedRequestsNumber,
+				FailedTests:     s.TrueNegativeTests.AppSecReqStats.FailedRequestsNumber,
+			},
+			TestSets: make(testSets),
 		}
 		for _, row := range s.TrueNegativeTests.SummaryTable {
 			if report.Summary.TrueNegativeTests.TestSets[row.TestSet] == nil {