Added KeylessAggregator. Renamed Aggregator to UnaryAggregator