Optimizations for production env