Making GroupBy value aware