diff --git a/src/profiling/CommandHandlerKey.cpp b/src/profiling/CommandHandlerKey.cpp
index 66b20c5..4d7e11a 100644
--- a/src/profiling/CommandHandlerKey.cpp
+++ b/src/profiling/CommandHandlerKey.cpp
@@ -11,6 +11,11 @@
 namespace profiling
 {
 
+uint32_t CommandHandlerKey::GetFamilyId() const
+{
+    return m_FamilyId;
+}
+
 uint32_t CommandHandlerKey::GetPacketId() const
 {
     return m_PacketId;
@@ -24,16 +29,21 @@
 bool CommandHandlerKey::operator<(const CommandHandlerKey& rhs) const
 {
     bool result = true;
-
-    if (m_PacketId == rhs.m_PacketId)
+    if (m_FamilyId == rhs.m_FamilyId)
     {
-        result = m_Version < rhs.m_Version;
+        if (m_PacketId == rhs.m_PacketId)
+        {
+            result = m_Version < rhs.m_Version;
+        }
+        else if (m_PacketId > rhs.m_PacketId)
+        {
+            result = false;
+        }
     }
-    else if (m_PacketId > rhs.m_PacketId)
+    else if (m_FamilyId > rhs.m_FamilyId)
     {
         result = false;
     }
-
     return result;
 }
 
@@ -54,7 +64,7 @@
 
 bool CommandHandlerKey::operator==(const CommandHandlerKey& rhs) const
 {
-    return m_PacketId == rhs.m_PacketId && m_Version == rhs.m_Version;
+    return m_FamilyId == rhs.m_FamilyId && m_PacketId == rhs.m_PacketId && m_Version == rhs.m_Version;
 }
 
 bool CommandHandlerKey::operator!=(const CommandHandlerKey& rhs) const