diff --git a/api/src/main/java/org/opencord/sadis/BandwidthProfileInformation.java b/api/src/main/java/org/opencord/sadis/BandwidthProfileInformation.java
index 0ad0ad4..3f71d0b 100644
--- a/api/src/main/java/org/opencord/sadis/BandwidthProfileInformation.java
+++ b/api/src/main/java/org/opencord/sadis/BandwidthProfileInformation.java
@@ -130,7 +130,8 @@
             return false;
         }
         BandwidthProfileInformation that = (BandwidthProfileInformation) o;
-        return peakInformationRate == that.peakInformationRate &&
+        return Objects.equals(id, that.id) &&
+                peakInformationRate == that.peakInformationRate &&
                 committedInformationRate == that.committedInformationRate &&
                 exceededInformationRate == that.exceededInformationRate &&
                 assuredInformationRate == that.assuredInformationRate &&
@@ -143,7 +144,7 @@
     @Override
     public int hashCode() {
 
-        return Objects.hash(peakInformationRate, peakBurstSize, committedInformationRate, committedBurstSize,
+        return Objects.hash(id, peakInformationRate, peakBurstSize, committedInformationRate, committedBurstSize,
                 exceededInformationRate, exceededBurstSize, assuredInformationRate, guaranteedInformationRate);
     }
 
