Add a portion of optimizations