Converted to a key/value store for the aggregate views