Optimized endpoints