Perfomance improvment of Aggregate medator

Please merge