Optimization functionality enhanced