Optimization

Updates for performance improvements per request