More tweaking
Add AggregateType to the builder