GWTII-134: extended to WMS layer + more uniform configuration