re-structuring the AggregationFeautreSource