service aggregator moved to separate file