         self.duration = TimeInterval(minutes: durationMinutes)
         self.timestamp = timestamp
         self.received = received
+        self.bolusVolume = rawValue["bolusVolume"] as? Double ?? 0
     }
 }

        rval["duration"] = duration / 60.0
        rval["timestamp"] = TimeFormat.timestampStrFromDate(timestamp)
        rval["received"] = received
        return rval
    }


    let duration: TimeInterval
    let timestamp: Date
    let received: Bool
    let bolusVolume: Double

    public init(rate: Double, duration: TimeInterval, timestamp: Date, received: Bool, bolusVolume: Double = 0) {
        self.rate = rate
        self.duration = duration
        self.timestamp = timestamp
        self.received = received
        self.bolusVolume = bolusVolume
    }
    
    public var dictionaryRepresentation: [String: Any] {
