Updated keywords to work with aggregation changes