updated context to store mapped keyvalues as IGroupings