Added aggregateHandler & handlerWrapper