Improve WMS configuration