Add optimizations