Add many optimizations