More updates to WMS/WFS Server section