- add support for custom aggregator
- move determination of aggregator class entirely to Aggregator.klass