Added raw/agg segment collections