Changes to aggregate view