WMS/WFS capabilities refactoring