Rework optimizations