add 2d support  in aggregator and optimizer