Changing key design and removing some aggregations