Support new aggregate API
0.1.1