Optiml perf improvements