diff --git a/presets/esports/csgo.json b/presets/esports/csgo.json
index 5c04b57b..890dddd2 100644
--- a/presets/esports/csgo.json
+++ b/presets/esports/csgo.json
@@ -16,7 +16,7 @@
 	"metrics": [
 	],
 	"statistics": [
-						{ "name" : "KDA Ratio", "equation" : "( $kills + $assists ) / $deaths", "precision" : 2, "description" : "Kills/deaths/assists ratio" }
+						{ "name" : "KDA Ratio", "equation" : "( $kills + $assists ) / $deaths", "precision" : 2, "type" : "average", "description" : "Kills/deaths/assists ratio" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/esports/dota2.json b/presets/esports/dota2.json
index f5d094d1..5fdec34d 100644
--- a/presets/esports/dota2.json
+++ b/presets/esports/dota2.json
@@ -20,7 +20,7 @@
 	"statistics": [
 						{ "name" : "Wins", "equation" : "$win" },
 						{ "name" : "Losses", "equation" : "$loss" },
-						{ "name" : "Winrate", "equation" : "$win / $eventsplayed * 100" }
+						{ "name" : "Winrate", "equation" : "$win / $eventsplayed * 100", "type" : "average" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/esports/lol.json b/presets/esports/lol.json
index d3cfbafb..1fcef174 100644
--- a/presets/esports/lol.json
+++ b/presets/esports/lol.json
@@ -23,9 +23,9 @@
 	"metrics": [
 	],
 	"statistics": [
-						{ "name" : "Avg. KDA Ratio", "equation" : "( $kills + $assists ) / $deaths", "precision" : 1, "description" : "Average kills/deaths/assists ratio" },
-						{ "name" : "Avg. Gold per Min", "equation" : "$gold / $eventminutes", "description" : "Average gold per minute" },
-						{ "name" : "Avg. Total Gold", "equation" : "$gold / $eventsplayed", "description" : "Average total gold" }
+						{ "name" : "Avg. KDA Ratio", "equation" : "( $kills + $assists ) / $deaths", "precision" : 1, "type" : "average", "description" : "Average kills/deaths/assists ratio" },
+						{ "name" : "Avg. Gold per Min", "equation" : "$gold / $eventminutes", "type" : "average", "description" : "Average gold per minute" },
+						{ "name" : "Avg. Total Gold", "equation" : "$gold / $eventsplayed", "type" : "average", "description" : "Average total gold" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/target-sports/snooker.json b/presets/target-sports/snooker.json
index 93cb559d..da876d58 100644
--- a/presets/target-sports/snooker.json
+++ b/presets/target-sports/snooker.json
@@ -25,7 +25,7 @@
 	"statistics": [
 						{ "name" : "Games Played", "equation" : "$eventsplayed" },
 						{ "name" : "Games Won", "equation" : "$win" },
-						{ "name" : "Win Percentage", "equation" : "$win / $eventsplayed * 100", "precision" : 2 }
+						{ "name" : "Win Percentage", "equation" : "$win / $eventsplayed * 100", "precision" : 2, "type" : "average" }
 	],
 	"options": {
 						"mode" : "player"
diff --git a/presets/team-sports/baseball.json b/presets/team-sports/baseball.json
index 9b03b608..27c7d62f 100644
--- a/presets/team-sports/baseball.json
+++ b/presets/team-sports/baseball.json
@@ -71,7 +71,7 @@
 	],
 	"statistics": [
 						{ "name" : "G", "equation" : "$eventsplayed", "description" : "Games played" },
-						{ "name" : "AVG", "equation" : "$h / $ab", "precision" : 3, "description" : "Batting average" }
+						{ "name" : "AVG", "equation" : "$h / $ab", "precision" : 3, "type" : "average", "description" : "Batting average" }
 	],
 	"options": {
 						"mode" : "team",
diff --git a/presets/team-sports/basketball.json b/presets/team-sports/basketball.json
index 20aff071..7e6946c9 100644
--- a/presets/team-sports/basketball.json
+++ b/presets/team-sports/basketball.json
@@ -59,15 +59,15 @@
 	"statistics": [
 						{ "name" : "G", "equation" : "$eventsattended", "description" : "Games played" },
 						{ "name" : "GS", "equation" : "$eventsstarted", "description" : "Games started" },
-						{ "name" : "FG%", "equation" : "( $fgm / $fga ) * 100", "precision" : 3, "description" : "Field goal percentage" },
-						{ "name" : "FT%", "equation" : "( $ftm / $fta ) * 100", "precision" : 3, "description" : "Free throw percentage" },
-						{ "name" : "3P%", "equation" : "( $threepm / $threepa ) * 100", "precision" : 3, "description" : "3-pointer percentage" },
-						{ "name" : "RPG", "equation" : "( $off + $def ) / $eventsplayed", "precision" : 1, "description" : "Rebounds per game" },
-						{ "name" : "APG", "equation" : "$ast / $eventsplayed", "precision" : 1, "description" : "Assists per game" },
-						{ "name" : "SPG", "equation" : "$stl / $eventsplayed", "precision" : 1, "description" : "Steals per game" },
-						{ "name" : "BPG", "equation" : "$blk / $eventsplayed", "precision" : 1, "description" : "Blocks per game" },
-						{ "name" : "PPG", "equation" : "$pts / $eventsplayed", "precision" : 1, "description" : "Points per game" },
-						{ "name" : "EFF", "equation" : "$pts + $off + $def + $ast + $stl + $blk - $fga + $fgm - $fta + $ftm + $to", "description" : "Efficiency rating" }
+						{ "name" : "FG%", "equation" : "( $fgm / $fga ) * 100", "precision" : 3, "type" : "average", "description" : "Field goal percentage" },
+						{ "name" : "FT%", "equation" : "( $ftm / $fta ) * 100", "precision" : 3, "type" : "average", "description" : "Free throw percentage" },
+						{ "name" : "3P%", "equation" : "( $threepm / $threepa ) * 100", "precision" : 3, "type" : "average", "description" : "3-pointer percentage" },
+						{ "name" : "RPG", "equation" : "( $off + $def ) / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Rebounds per game" },
+						{ "name" : "APG", "equation" : "$ast / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Assists per game" },
+						{ "name" : "SPG", "equation" : "$stl / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Steals per game" },
+						{ "name" : "BPG", "equation" : "$blk / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Blocks per game" },
+						{ "name" : "PPG", "equation" : "$pts / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Points per game" },
+						{ "name" : "EFF", "equation" : "$pts + $off + $def + $ast + $stl + $blk - $fga + $fgm - $fta + $ftm + $to", "type" : "average", "description" : "Efficiency rating" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/team-sports/cricket.json b/presets/team-sports/cricket.json
index eb3016c8..761507a3 100644
--- a/presets/team-sports/cricket.json
+++ b/presets/team-sports/cricket.json
@@ -46,7 +46,7 @@
 	],
 	"statistics": [
 						{ "name" : "Mat", "equation" : "$eventsplayed", "description" : "Matches played" },
-						{ "name" : "SR", "equation" : "( $runs / $b ) * 100", "precision" : 2, "description" : "Strike Rate" }
+						{ "name" : "SR", "equation" : "( $runs / $b ) * 100", "precision" : 2, "type" : "average", "description" : "Strike Rate" }
 	],
 	"options": {
 						"mode" : "team",
diff --git a/presets/team-sports/floorball.json b/presets/team-sports/floorball.json
index b3a456d5..f060956d 100644
--- a/presets/team-sports/floorball.json
+++ b/presets/team-sports/floorball.json
@@ -50,9 +50,9 @@
 	"statistics": [
 						{ "name" : "GP", "equation" : "$eventsplayed", "description" : "Games played" },
 						{ "name" : "P", "equation" : "$g + $assists", "description" : "Points" },
-						{ "name" : "GAA", "equation" : "$ga / $eventsplayed", "precision" : 2, "description" : "Goals against average" },
-						{ "name" : "S%", "equation" : "$g / $s * 100", "precision" : 2, "description" : "Shot percentage" },
-						{ "name" : "SV%", "equation" : "$sv / $sa * 100", "precision" : 2, "description" : "Save percentage" }
+						{ "name" : "GAA", "equation" : "$ga / $eventsplayed", "precision" : 2, "type" : "average", "description" : "Goals against average" },
+						{ "name" : "S%", "equation" : "$g / $s * 100", "precision" : 2, "type" : "average", "description" : "Shot percentage" },
+						{ "name" : "SV%", "equation" : "$sv / $sa * 100", "precision" : 2, "type" : "average", "description" : "Save percentage" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/team-sports/football.json b/presets/team-sports/football.json
index ef8170ce..d5975d6a 100644
--- a/presets/team-sports/football.json
+++ b/presets/team-sports/football.json
@@ -59,8 +59,8 @@
 	"statistics": [
 						{ "name" : "G", "equation" : "$eventsplayed", "description" : "Games played" },
 						{ "name" : "GS", "equation" : "$eventsstarted", "description" : "Games started" },
-						{ "name" : "Avg", "equation" : "$yds / $att", "precision" : 1, "description" : "Average yards per carry" },
-						{ "name" : "Rec Avg", "equation" : "$recyds / $rec", "precision" : 1, "description" : "Average yards per reception" }
+						{ "name" : "Avg", "equation" : "$yds / $att", "precision" : 1, "type" : "average", "description" : "Average yards per carry" },
+						{ "name" : "Rec Avg", "equation" : "$recyds / $rec", "precision" : 1, "type" : "average", "description" : "Average yards per reception" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/team-sports/footy.json b/presets/team-sports/footy.json
index 15c116e7..e08a1196 100644
--- a/presets/team-sports/footy.json
+++ b/presets/team-sports/footy.json
@@ -44,13 +44,13 @@
 	],
 	"statistics": [
 						{ "name" : "Games played", "equation" : "$eventsplayed" },
-						{ "name" : "K", "equation" : "$kicks / $eventsplayed", "precision" : 1, "description" : "Average kicks per game" },
-						{ "name" : "H", "equation" : "$handballs / $eventsplayed", "precision" : 1, "description" : "Average handballs per game" },
-						{ "name" : "D", "equation" : "$disposals / $eventsplayed", "precision" : 1, "description" : "Average disposals per game" },
-						{ "name" : "M", "equation" : "$marks / $eventsplayed", "precision" : 1, "description" : "Average marks per game" },
-						{ "name" : "HO", "equation" : "$hitouts / $eventsplayed", "precision" : 1, "description" : "Average hitouts per game" },
-						{ "name" : "T", "equation" : "$tackles / $eventsplayed", "precision" : 1, "description" : "Average tackles per game" },
-						{ "name" : "G", "equation" : "$goals / $eventsplayed", "precision" : 1, "description" : "Average goals per game" }
+						{ "name" : "K", "equation" : "$kicks / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Average kicks per game" },
+						{ "name" : "H", "equation" : "$handballs / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Average handballs per game" },
+						{ "name" : "D", "equation" : "$disposals / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Average disposals per game" },
+						{ "name" : "M", "equation" : "$marks / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Average marks per game" },
+						{ "name" : "HO", "equation" : "$hitouts / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Average hitouts per game" },
+						{ "name" : "T", "equation" : "$tackles / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Average tackles per game" },
+						{ "name" : "G", "equation" : "$goals / $eventsplayed", "precision" : 1, "type" : "average", "description" : "Average goals per game" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/team-sports/ice-hockey.json b/presets/team-sports/ice-hockey.json
index 98044f2e..5c62a51f 100644
--- a/presets/team-sports/ice-hockey.json
+++ b/presets/team-sports/ice-hockey.json
@@ -53,8 +53,8 @@
 	"statistics": [
 						{ "name" : "GP", "equation" : "$eventsplayed", "description" : "Games played" },
 						{ "name" : "P", "equation" : "$g + $assists", "description" : "Points" },
-						{ "name" : "S%", "equation" : "$g / $s * 100", "precision" : 2, "description" : "Shot percentage" },
-						{ "name" : "SV%", "equation" : "$sv / $sa * 100", "precision" : 2, "description" : "Save percentage" }
+						{ "name" : "S%", "equation" : "$g / $s * 100", "precision" : 2, "type" : "average", "description" : "Shot percentage" },
+						{ "name" : "SV%", "equation" : "$sv / $sa * 100", "precision" : 2, "type" : "average", "description" : "Save percentage" }
 	],
 	"options": {
 						"mode" : "team",
diff --git a/presets/team-sports/lacrosse.json b/presets/team-sports/lacrosse.json
index e80d1254..ed71fce7 100644
--- a/presets/team-sports/lacrosse.json
+++ b/presets/team-sports/lacrosse.json
@@ -43,8 +43,8 @@
 	],
 	"statistics": [
 						{ "name" : "Games", "equation" : "$eventsplayed", "description" : "Games played" },
-						{ "name" : "Shooting %", "equation" : "$goals / $shots", "precision" : 1, "description" : "Shooting percentage" },
-						{ "name" : "SoG %", "equation" : "$sog / $shots", "precision" : 1, "description" : "Shots on goal percentage" }
+						{ "name" : "Shooting %", "equation" : "$goals / $shots", "precision" : 1, "type" : "average", "description" : "Shooting percentage" },
+						{ "name" : "SoG %", "equation" : "$sog / $shots", "precision" : 1, "type" : "average", "description" : "Shots on goal percentage" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/team-sports/soccer.json b/presets/team-sports/soccer.json
index 1a9dd30f..dd2300b2 100644
--- a/presets/team-sports/soccer.json
+++ b/presets/team-sports/soccer.json
@@ -38,9 +38,9 @@
 	],
 	"statistics": [
 						{ "name" : "Appearances", "equation" : "$eventsplayed", "description" : "Matches played" },
-						{ "name" : "Win Ratio", "equation" : "$win / $eventsplayed * 100", "precision" : 2, "description" : "Win ratio" },
-						{ "name" : "Draw Ratio", "equation" : "$draw / $eventsplayed * 100", "precision" : 2, "description" : "Draw ratio" },
-						{ "name" : "Loss Ratio", "equation" : "$loss / $eventsplayed * 100", "precision" : 2, "description" : "Loss ratio" }
+						{ "name" : "Win Ratio", "equation" : "$win / $eventsplayed * 100", "precision" : 2, "type" : "average", "description" : "Win ratio" },
+						{ "name" : "Draw Ratio", "equation" : "$draw / $eventsplayed * 100", "precision" : 2, "type" : "average", "description" : "Draw ratio" },
+						{ "name" : "Loss Ratio", "equation" : "$loss / $eventsplayed * 100", "precision" : 2, "type" : "average", "description" : "Loss ratio" }
 	],
 	"options": {
 						"mode" : "team",
diff --git a/presets/team-sports/softball.json b/presets/team-sports/softball.json
index 58f97d49..7e066ac9 100644
--- a/presets/team-sports/softball.json
+++ b/presets/team-sports/softball.json
@@ -68,7 +68,7 @@
 	],
 	"statistics": [
 						{ "name" : "G", "equation" : "$eventsplayed", "description" : "Games played" },
-						{ "name" : "AVG", "equation" : "$h / $ab", "precision" : 3, "description" : "Batting average" }
+						{ "name" : "AVG", "equation" : "$h / $ab", "precision" : 3, "type" : "average", "description" : "Batting average" }
 	],
 	"options": {
 						"mode" : "team",
diff --git a/presets/team-sports/volleyball.json b/presets/team-sports/volleyball.json
index e140e842..bfb07344 100644
--- a/presets/team-sports/volleyball.json
+++ b/presets/team-sports/volleyball.json
@@ -45,9 +45,9 @@
 						"Height"
 	],
 	"statistics": [
-						{ "name" : "Pct", "equation" : "( $k - $e ) / $ta", "description" : "Hitting percentage" },
-						{ "name" : "B/S", "equation" : "$b / $sets", "description" : "Blocks per set" },
-						{ "name" : "A/S", "equation" : "$a / $sets", "description" : "Assists per set" }
+						{ "name" : "Pct", "equation" : "( $k - $e ) / $ta", "type" : "average", "description" : "Hitting percentage" },
+						{ "name" : "B/S", "equation" : "$b / $sets", "type" : "average", "description" : "Blocks per set" },
+						{ "name" : "A/S", "equation" : "$a / $sets", "type" : "average", "description" : "Assists per set" }
 	],
 	"options": {
 						"mode" : "team"
diff --git a/presets/water-sports/water-polo.json b/presets/water-sports/water-polo.json
index 9307ca1b..0b761c4b 100644
--- a/presets/water-sports/water-polo.json
+++ b/presets/water-sports/water-polo.json
@@ -47,9 +47,9 @@
 	],
 	"statistics": [
 						{ "name" : "Appearances", "equation" : "$eventsplayed", "description" : "Matches played" },
-						{ "name" : "Win Ratio", "equation" : "$win / $eventsplayed * 100", "precision" : 2 },
-						{ "name" : "Draw Ratio", "equation" : "$draw / $eventsplayed * 100", "precision" : 2 },
-						{ "name" : "Loss Ratio", "equation" : "$loss / $eventsplayed * 100", "precision" : 2 }
+						{ "name" : "Win Ratio", "equation" : "$win / $eventsplayed * 100", "precision" : 2, "type" : "average" },
+						{ "name" : "Draw Ratio", "equation" : "$draw / $eventsplayed * 100", "precision" : 2, "type" : "average" },
+						{ "name" : "Loss Ratio", "equation" : "$loss / $eventsplayed * 100", "precision" : 2, "type" : "average" }
 	],
 	"options": {
 						"mode" : "team"