diff --git a/ClientCommand.cpp b/ClientCommand.cpp
index dbcaf36d..45972545 100644
--- a/ClientCommand.cpp
+++ b/ClientCommand.cpp
@@ -928,9 +928,10 @@ void CClient::UserCommand(const CString& sLine) {
 
 		PutStatus("BufferCount for [" + sChan + "] set to [" + CString(pChan->GetBufferCount()) + "]");
 	} else if (m_pUser->IsAdmin() && sCommand.Equals("TRAFFIC")) {
-		map<CString, std::pair<unsigned long long, unsigned long long> >::const_iterator it;
-		map<CString, std::pair<unsigned long long, unsigned long long> > traffic =
-			CZNC::Get().GetTrafficStats();
+		CZNC::TrafficStatsPair Users, ZNC, Total;
+		CZNC::TrafficStatsMap traffic = CZNC::Get().GetTrafficStats(Users, ZNC, Total);
+		CZNC::TrafficStatsMap::const_iterator it;
+
 		CTable Table;
 		Table.AddColumn("Username");
 		Table.AddColumn("In");
@@ -945,6 +946,24 @@ void CClient::UserCommand(const CString& sLine) {
 			Table.SetCell("Total", CString::ToByteStr(it->second.first + it->second.second));
 		}
 
+		Table.AddRow();
+		Table.SetCell("Username", "<Users>");
+		Table.SetCell("In", CString::ToByteStr(Users.first));
+		Table.SetCell("Out", CString::ToByteStr(Users.second));
+		Table.SetCell("Total", CString::ToByteStr(Users.first + Users.second));
+
+		Table.AddRow();
+		Table.SetCell("Username", "<ZNC>");
+		Table.SetCell("In", CString::ToByteStr(ZNC.first));
+		Table.SetCell("Out", CString::ToByteStr(ZNC.second));
+		Table.SetCell("Total", CString::ToByteStr(ZNC.first + ZNC.second));
+
+		Table.AddRow();
+		Table.SetCell("Username", "<Total>");
+		Table.SetCell("In", CString::ToByteStr(Total.first));
+		Table.SetCell("Out", CString::ToByteStr(Total.second));
+		Table.SetCell("Total", CString::ToByteStr(Total.first + Total.second));
+
 		PutStatus(Table);
 	} else if (m_pUser->IsAdmin() && sCommand.Equals("UPTIME")) {
 		PutStatus("Running for " + CZNC::Get().GetUptime());
diff --git a/znc.cpp b/znc.cpp
index b52b6934..48342e9b 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -1726,8 +1726,9 @@ CZNC& CZNC::Get() {
 	return *pZNC;
 }
 
-map<CString, std::pair<unsigned long long, unsigned long long> > CZNC::GetTrafficStats() {
-	map<CString, std::pair<unsigned long long, unsigned long long> > ret;
+CZNC::TrafficStatsMap CZNC::GetTrafficStats(TrafficStatsPair &Users,
+			TrafficStatsPair &ZNC, TrafficStatsPair &Total) {
+	TrafficStatsMap ret;
 	unsigned long long uiUsers_in, uiUsers_out, uiZNC_in, uiZNC_out;
 	const map<CString, CUser*>& msUsers = CZNC::Get().GetUserMap();
 
@@ -1736,8 +1737,7 @@ map<CString, std::pair<unsigned long long, unsigned long long> > CZNC::GetTraffi
 	uiZNC_out = BytesWritten();
 
 	for (map<CString, CUser*>::const_iterator it = msUsers.begin(); it != msUsers.end(); it++) {
-		ret[it->first] = std::pair<unsigned long long, unsigned long long>
-			(it->second->BytesRead(), it->second->BytesWritten());
+		ret[it->first] = TrafficStatsPair(it->second->BytesRead(), it->second->BytesWritten());
 		uiUsers_in  += it->second->BytesRead();
 		uiUsers_out += it->second->BytesWritten();
 	}
@@ -1761,9 +1761,9 @@ map<CString, std::pair<unsigned long long, unsigned long long> > CZNC::GetTraffi
 		}
 	}
 
-	ret["<Users>"] = std::pair<unsigned long long, unsigned long long>(uiUsers_in, uiUsers_out);
-	ret["<ZNC>"]   = std::pair<unsigned long long, unsigned long long>(uiZNC_in, uiZNC_out);
-	ret["<Total>"] = std::pair<unsigned long long, unsigned long long>(uiUsers_in + uiZNC_in, uiUsers_out + uiZNC_out);
+	Users = TrafficStatsPair(uiUsers_in, uiUsers_out);
+	ZNC   = TrafficStatsPair(uiZNC_in, uiZNC_out);
+	Total = TrafficStatsPair(uiUsers_in + uiZNC_in, uiUsers_out + uiZNC_out);
 
 	return ret;
 }
diff --git a/znc.h b/znc.h
index 3549cb68..5a05fad1 100644
--- a/znc.h
+++ b/znc.h
@@ -124,10 +124,16 @@ public:
 	void AddBytesWritten(unsigned long long u) { m_uBytesWritten += u; }
 	unsigned long long BytesRead() const { return m_uBytesRead; }
 	unsigned long long BytesWritten() const { return m_uBytesWritten; }
-	// Returns a map which maps user names to <traffic in, traffic out>, special
-	// "usernames" are <Users> (All users total), <ZNC> (Traffic which couldn't be
-	// accounted to any user) and <Total> (Total traffic, <Users> + <ZNC>).
-	map<CString, std::pair<unsigned long long, unsigned long long> > GetTrafficStats();
+
+	// Traffic fun
+	typedef std::pair<unsigned long long, unsigned long long> TrafficStatsPair;
+	typedef std::map<CString, TrafficStatsPair> TrafficStatsMap;
+	// Returns a map which maps user names to <traffic in, traffic out>
+	// while also providing the traffic of all users together, traffic which
+	// couldn't be accounted to any particular user and the total traffic
+	// generated through ZNC.
+	TrafficStatsMap GetTrafficStats(TrafficStatsPair &Users,
+			TrafficStatsPair &ZNC, TrafficStatsPair &Total);
 
 	// Authenticate a user.
 	// The result is passed back via callbacks to CAuthBase.