Adding aggregator, gds and oath