Added abstraction in ServiceAggregator