Added content router
Added aggregator