Support multiple aggregateOn keys
Clean up logging a bit
1.3.1