Changes to attempt to get aggregation working