Add performance tunings