Adding in group aggregation, symbol shorcuts