More performance tuning