Added AggregateUnits class