Updated to reflect media server optimizations