[pycsw] 01/02: Imported Upstream version 2.0.0~alpha1+dfsg

Bas Couwenberg sebastic at debian.org
Thu Jul 7 01:02:10 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch upstream
in repository pycsw.

commit c4c7946ef925ed990c593a1fee45f4d2f3f856a2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 6 17:45:55 2016 +0200

    Imported Upstream version 2.0.0~alpha1+dfsg
---
 .github/ISSUE_TEMPLATE.md                          |   21 +
 .github/PULL_REQUEST_TEMPLATE.md                   |   12 +
 .travis.yml                                        |   32 +-
 COMMITTERS.txt                                     |   15 +-
 CONTRIBUTING.rst                                   |   33 +-
 LICENSE.txt                                        |    5 +-
 VERSION.txt                                        |    2 +-
 bin/pycsw-admin.py                                 |   64 +-
 bin/pycsw-pylint.sh                                |    2 +-
 csw.py                                             |   60 +-
 default-sample.cfg                                 |    6 +-
 docs/_templates/layout.html                        |    2 +-
 docs/administration.rst                            |    2 +-
 docs/conf.py                                       |   34 +-
 docs/hhypermap.rst                                 |   17 +
 docs/index.rst                                     |    2 +
 docs/installation.rst                              |   23 +-
 docs/introduction.rst                              |    8 +-
 docs/json.rst                                      |    7 +
 docs/license.rst                                   |    7 +
 docs/outputschemas.rst                             |    3 +-
 docs/testing.rst                                   |    2 +
 docs/tools.rst                                     |    3 +-
 docs/transactions.rst                              |    2 +
 etc/dist/opensuse/python-pycsw.spec                |   12 +-
 etc/mappings.py                                    |    4 +-
 pavement.py                                        |   45 +-
 pycsw/__init__.py                                  |    6 +-
 pycsw/config.py                                    |  339 ---
 pycsw/{plugins/profiles => core}/__init__.py       |    4 +-
 pycsw/{ => core}/admin.py                          |   40 +-
 pycsw/core/config.py                               |  593 +++++
 .../profiles/__init__.py => core/etree.py}         |    6 +-
 .../{plugins/profiles => core/formats}/__init__.py |    4 +-
 pycsw/{ => core}/formats/fmt_json.py               |   19 +-
 pycsw/{ => core}/log.py                            |    4 +-
 pycsw/{ => core}/metadata.py                       |  300 ++-
 pycsw/{ => core}/repository.py                     |   10 +-
 .../core/schemas/catalog.xml                       |   20 +-
 .../{ => core}/schemas/ogc/OGC-SOFTWARE-NOTICE.txt |    0
 pycsw/{ => core}/schemas/ogc/README.txt            |    0
 .../schemas/ogc/csw/2.0.2/CSW-discovery.xsd        |    0
 .../schemas/ogc/csw/2.0.2/CSW-publication.xsd      |    0
 .../{ => core}/schemas/ogc/csw/2.0.2/rec-dcmes.xsd |    0
 .../schemas/ogc/csw/2.0.2/rec-dcterms.xsd          |    0
 pycsw/{ => core}/schemas/ogc/csw/2.0.2/record.xsd  |    0
 pycsw/core/schemas/ogc/csw/3.0/README.txt          |   25 +
 pycsw/core/schemas/ogc/csw/3.0/cswAll.xsd          |   33 +
 pycsw/core/schemas/ogc/csw/3.0/cswCommon.xsd       |   71 +
 .../schemas/ogc/csw/3.0/cswGetCapabilities.xsd     |   80 +
 pycsw/core/schemas/ogc/csw/3.0/cswGetDomain.xsd    |  146 ++
 .../core/schemas/ogc/csw/3.0/cswGetRecordById.xsd  |   58 +
 pycsw/core/schemas/ogc/csw/3.0/cswGetRecords.xsd   |  391 +++
 pycsw/core/schemas/ogc/csw/3.0/cswHarvest.xsd      |   95 +
 pycsw/core/schemas/ogc/csw/3.0/cswTransaction.xsd  |  187 ++
 pycsw/core/schemas/ogc/csw/3.0/cswUnHarvest.xsd    |   77 +
 pycsw/core/schemas/ogc/csw/3.0/rec-dcmes.xsd       |  245 ++
 .../schemas/ogc/csw/3.0}/rec-dcterms.xsd           |   33 +-
 pycsw/core/schemas/ogc/csw/3.0/record.xsd          |  170 ++
 pycsw/{ => core}/schemas/ogc/filter/1.1.0/expr.xsd |    0
 .../{ => core}/schemas/ogc/filter/1.1.0/filter.xsd |    0
 .../ogc/filter/1.1.0/filterCapabilities.xsd        |    0
 pycsw/{ => core}/schemas/ogc/filter/1.1.0/sort.xsd |    0
 pycsw/core/schemas/ogc/filter/2.0/expr.xsd         |   44 +
 pycsw/core/schemas/ogc/filter/2.0/filter.xsd       |  395 +++
 pycsw/core/schemas/ogc/filter/2.0/filterAll.xsd    |   23 +
 .../schemas/ogc/filter/2.0/filterCapabilities.xsd  |  286 +++
 pycsw/core/schemas/ogc/filter/2.0/query.xsd        |   70 +
 .../1.1.0 => core/schemas/ogc/filter/2.0}/sort.xsd |   37 +-
 .../schemas/ogc/gml/3.1.1/base/basicTypes.xsd      |    0
 .../ogc/gml/3.1.1/base/coordinateOperations.xsd    |    0
 .../gml/3.1.1/base/coordinateReferenceSystems.xsd  |    0
 .../ogc/gml/3.1.1/base/coordinateSystems.xsd       |    0
 .../schemas/ogc/gml/3.1.1/base/coverage.xsd        |    0
 .../schemas/ogc/gml/3.1.1/base/dataQuality.xsd     |    0
 .../schemas/ogc/gml/3.1.1/base/datums.xsd          |    0
 .../schemas/ogc/gml/3.1.1/base/defaultStyle.xsd    |    2 +-
 .../schemas/ogc/gml/3.1.1/base/dictionary.xsd      |    0
 .../schemas/ogc/gml/3.1.1/base/direction.xsd       |    0
 .../schemas/ogc/gml/3.1.1/base/dynamicFeature.xsd  |    0
 .../schemas/ogc/gml/3.1.1/base/feature.xsd         |    0
 .../ogc/gml/3.1.1/base/geometryAggregates.xsd      |    0
 .../ogc/gml/3.1.1/base/geometryBasic0d1d.xsd       |    0
 .../schemas/ogc/gml/3.1.1/base/geometryBasic2d.xsd |    0
 .../ogc/gml/3.1.1/base/geometryComplexes.xsd       |    0
 .../ogc/gml/3.1.1/base/geometryPrimitives.xsd      |    0
 .../{ => core}/schemas/ogc/gml/3.1.1/base/gml.xsd  |    0
 .../schemas/ogc/gml/3.1.1/base/gmlBase.xsd         |    0
 .../schemas/ogc/gml/3.1.1/base/grids.xsd           |    0
 .../schemas/ogc/gml/3.1.1/base/measures.xsd        |    0
 .../schemas/ogc/gml/3.1.1/base/observation.xsd     |    0
 .../ogc/gml/3.1.1/base/referenceSystems.xsd        |    0
 .../schemas/ogc/gml/3.1.1/base/temporal.xsd        |    0
 .../gml/3.1.1/base/temporalReferenceSystems.xsd    |    0
 .../ogc/gml/3.1.1/base/temporalTopology.xsd        |    0
 .../schemas/ogc/gml/3.1.1/base/topology.xsd        |    0
 .../schemas/ogc/gml/3.1.1/base/units.xsd           |    0
 .../schemas/ogc/gml/3.1.1/base/valueObjects.xsd    |    0
 .../ogc/gml/3.2.1/SchematronConstraints.xml        |   71 +
 pycsw/core/schemas/ogc/gml/3.2.1/basicTypes.xsd    |  268 ++
 .../schemas/ogc/gml/3.2.1/coordinateOperations.xsd |  525 ++++
 .../ogc/gml/3.2.1/coordinateReferenceSystems.xsd   |  373 +++
 .../schemas/ogc/gml/3.2.1/coordinateSystems.xsd    |  297 +++
 pycsw/core/schemas/ogc/gml/3.2.1/coverage.xsd      |  292 +++
 pycsw/core/schemas/ogc/gml/3.2.1/datums.xsd        |  287 +++
 .../schemas/ogc/gml/3.2.1}/defaultStyle.xsd        |   27 +-
 .../core/schemas/ogc/gml/3.2.1/deprecatedTypes.xsd | 1133 +++++++++
 pycsw/core/schemas/ogc/gml/3.2.1/dictionary.xsd    |   90 +
 pycsw/core/schemas/ogc/gml/3.2.1/direction.xsd     |   84 +
 .../core/schemas/ogc/gml/3.2.1/dynamicFeature.xsd  |  109 +
 pycsw/core/schemas/ogc/gml/3.2.1/feature.xsd       |   94 +
 .../schemas/ogc/gml/3.2.1/geometryAggregates.xsd   |  197 ++
 .../schemas/ogc/gml/3.2.1/geometryBasic0d1d.xsd    |  277 ++
 .../core/schemas/ogc/gml/3.2.1/geometryBasic2d.xsd |  124 +
 .../schemas/ogc/gml/3.2.1/geometryComplexes.xsd    |   95 +
 .../schemas/ogc/gml/3.2.1/geometryPrimitives.xsd   |  846 +++++++
 .../base => core/schemas/ogc/gml/3.2.1}/gml.xsd    |   14 +-
 .../gml => core/schemas/ogc/gml/3.2.1}/gmlBase.xsd |  166 +-
 .../schemas/ogc/gml/3.2.1/gml_32_geometries.rdf    |  368 +++
 .../schemas/ogc/gml/3.2.1/gml_3_2_1-ReadMe.txt     |   58 +
 pycsw/core/schemas/ogc/gml/3.2.1/grids.xsd         |   64 +
 pycsw/core/schemas/ogc/gml/3.2.1/measures.xsd      |   68 +
 pycsw/core/schemas/ogc/gml/3.2.1/observation.xsd   |   95 +
 .../schemas/ogc/gml/3.2.1/referenceSystems.xsd     |   70 +
 pycsw/core/schemas/ogc/gml/3.2.1/temporal.xsd      |  269 ++
 .../ogc/gml/3.2.1/temporalReferenceSystems.xsd     |  189 ++
 .../schemas/ogc/gml/3.2.1/temporalTopology.xsd     |  119 +
 pycsw/core/schemas/ogc/gml/3.2.1/topology.xsd      |  386 +++
 pycsw/core/schemas/ogc/gml/3.2.1/units.xsd         |  162 ++
 pycsw/core/schemas/ogc/gml/3.2.1/valueObjects.xsd  |  205 ++
 .../schemas/ogc/ows/1.0.0/ows19115subset.xsd       |    0
 pycsw/{ => core}/schemas/ogc/ows/1.0.0/owsAll.xsd  |    0
 .../{ => core}/schemas/ogc/ows/1.0.0/owsCommon.xsd |    0
 .../ogc/ows/1.0.0/owsDataIdentification.xsd        |    0
 .../schemas/ogc/ows/1.0.0/owsExceptionReport.xsd   |    0
 .../schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd   |    0
 .../ogc/ows/1.0.0/owsOperationsMetadata.xsd        |    0
 .../ogc/ows/1.0.0/owsServiceIdentification.xsd     |    0
 .../schemas/ogc/ows/1.0.0/owsServiceProvider.xsd   |    0
 .../schemas/ogc/ows/1.1.0}/ows19115subset.xsd      |   36 +-
 .../schemas/ogc/ows/1.1.0}/owsAll.xsd              |   15 +-
 .../schemas/ogc/ows/1.1.0}/owsCommon.xsd           |   15 +-
 pycsw/core/schemas/ogc/ows/1.1.0/owsContents.xsd   |   87 +
 .../ogc/ows/1.1.0}/owsDataIdentification.xsd       |   50 +-
 pycsw/core/schemas/ogc/ows/1.1.0/owsDomainType.xsd |  280 ++
 .../schemas/ogc/ows/1.1.0}/owsExceptionReport.xsd  |   26 +-
 .../schemas/ogc/ows/1.1.0}/owsGetCapabilities.xsd  |   17 +-
 .../schemas/ogc/ows/1.1.0/owsGetResourceByID.xsd   |   52 +
 .../schemas/ogc/ows/1.1.0/owsInputOutputData.xsd   |   60 +
 pycsw/core/schemas/ogc/ows/1.1.0/owsManifest.xsd   |  125 +
 .../ogc/ows/1.1.0}/owsOperationsMetadata.xsd       |   40 +-
 .../ogc/ows/1.1.0}/owsServiceIdentification.xsd    |   20 +-
 .../schemas/ogc/ows/1.1.0}/owsServiceProvider.xsd  |   14 +-
 pycsw/core/schemas/ogc/ows/2.0/ows19115subset.xsd  |  364 +++
 .../ogc/ows/2.0/owsAdditionalParameters.xsd        |  114 +
 pycsw/core/schemas/ogc/ows/2.0/owsAll.xsd          |   29 +
 pycsw/core/schemas/ogc/ows/2.0/owsCommon.xsd       |  275 ++
 pycsw/core/schemas/ogc/ows/2.0/owsContents.xsd     |  163 ++
 .../schemas/ogc/ows/2.0/owsDataIdentification.xsd  |  202 ++
 pycsw/core/schemas/ogc/ows/2.0/owsDomainType.xsd   |  388 +++
 .../schemas/ogc/ows/2.0/owsExceptionReport.xsd     |  126 +
 .../schemas/ogc/ows/2.0/owsGetCapabilities.xsd     |  220 ++
 .../schemas/ogc/ows/2.0/owsGetResourceByID.xsd     |   83 +
 .../schemas/ogc/ows/2.0/owsInputOutputData.xsd     |   98 +
 pycsw/core/schemas/ogc/ows/2.0/owsManifest.xsd     |  181 ++
 .../schemas/ogc/ows/2.0/owsOperationsMetadata.xsd  |  234 ++
 .../ogc/ows/2.0/owsServiceIdentification.xsd       |   98 +
 .../schemas/ogc/ows/2.0/owsServiceProvider.xsd     |   64 +
 pycsw/{ => core}/schemas/w3c/1999/xlink.xsd        |    0
 pycsw/{ => core}/schemas/w3c/2001/xml.xsd          |    0
 pycsw/{ => core}/util.py                           |   81 +-
 pycsw/oaipmh.py                                    |   36 +-
 pycsw/{plugins/profiles => ogc}/__init__.py        |    4 +-
 pycsw/{plugins/profiles => ogc/csw}/__init__.py    |    4 +-
 pycsw/ogc/csw/csw2.py                              | 1988 +++++++++++++++
 pycsw/ogc/csw/csw3.py                              | 2136 ++++++++++++++++
 pycsw/{plugins/profiles => ogc/fes}/__init__.py    |    4 +-
 pycsw/{fes.py => ogc/fes/fes1.py}                  |   23 +-
 pycsw/{fes.py => ogc/fes/fes2.py}                  |   74 +-
 pycsw/{plugins/profiles => ogc/gml}/__init__.py    |    4 +-
 pycsw/{gml.py => ogc/gml/gml3.py}                  |    7 +-
 pycsw/opensearch.py                                |  269 +-
 pycsw/plugins/__init__.py                          |    4 +-
 pycsw/plugins/outputschemas/__init__.py            |    7 +-
 pycsw/plugins/outputschemas/atom.py                |   50 +-
 pycsw/plugins/outputschemas/dif.py                 |   38 +-
 pycsw/plugins/outputschemas/fgdc.py                |   10 +-
 pycsw/plugins/outputschemas/gm03.py                |  240 ++
 pycsw/plugins/profiles/__init__.py                 |    4 +-
 pycsw/plugins/profiles/apiso/__init__.py           |    4 +-
 pycsw/plugins/profiles/apiso/apiso.py              |   74 +-
 .../ogc/iso/19139/20060504/gco/basicTypes.xsd      |    2 +-
 .../schemas/ogc/iso/19139/20060504/gco/gcoBase.xsd |    2 +-
 .../schemas/ogc/iso/19139/20060504/gml/gmlBase.xsd |    2 +-
 .../ogc/iso/19139/20060504/gmx/extendedTypes.xsd   |    2 +-
 .../resources/Codelist/ML_gmxCodelists.xml         |    2 +-
 .../20060504/resources/Codelist/gmxCodelists.xml   |    2 +-
 .../iso/19139/20060504/resources/crs/ML_gmxCrs.xml |    2 +-
 .../iso/19139/20060504/resources/crs/gmxCrs.xml    |    2 +-
 .../iso/19139/20060504/resources/example/fr-fr.xml |    2 +-
 .../iso/19139/20060504/resources/uom/ML_gmxUom.xml |    2 +-
 .../iso/19139/20060504/resources/uom/gmxUom.xml    |    2 +-
 .../schemas/ogc/iso/19139/20070417/ReadMe.txt      |   26 +
 .../schemas/ogc/iso/19139/20070417/gco/ReadMe.txt  |   47 +
 .../{20060504 => 20070417}/gco/basicTypes.xsd      |   12 +-
 .../schemas/ogc/iso/19139/20070417/gco/gco.xsd     |   12 +
 .../19139/{20060504 => 20070417}/gco/gcoBase.xsd   |   10 +-
 .../schemas/ogc/iso/19139/20070417/gmd/ReadMe.txt  |   45 +
 .../iso/19139/20070417/gmd/applicationSchema.xsd   |   43 +
 .../ogc/iso/19139/20070417/gmd/citation.xsd        |  276 ++
 .../ogc/iso/19139/20070417/gmd/constraints.xsd     |  107 +
 .../schemas/ogc/iso/19139/20070417/gmd/content.xsd |  190 ++
 .../ogc/iso/19139/20070417/gmd/dataQuality.xsd     |  556 ++++
 .../ogc/iso/19139/20070417/gmd/distribution.xsd    |  203 ++
 .../schemas/ogc/iso/19139/20070417/gmd/extent.xsd  |  206 ++
 .../ogc/iso/19139/20070417/gmd/freeText.xsd        |  123 +
 .../schemas/ogc/iso/19139/20070417/gmd/gmd.xsd     |   12 +
 .../ogc/iso/19139/20070417/gmd/identification.xsd  |  216 +-
 .../ogc/iso/19139/20070417/gmd/maintenance.xsd     |   87 +
 .../iso/19139/20070417/gmd/metadataApplication.xsd |  176 ++
 .../ogc/iso/19139/20070417/gmd/metadataEntity.xsd  |   71 +
 .../iso/19139/20070417/gmd/metadataExtension.xsd   |  100 +
 .../iso/19139/20070417/gmd/portrayalCatalogue.xsd  |   37 +
 .../ogc/iso/19139/20070417/gmd/referenceSystem.xsd |  101 +
 .../19139/20070417/gmd/spatialRepresentation.xsd   |  238 ++
 .../schemas/ogc/iso/19139/20070417/gmx/ReadMe.txt  |   47 +
 .../ogc/iso/19139/20070417/gmx/catalogues.xsd      |  113 +
 .../ogc/iso/19139/20070417/gmx/codelistItem.xsd    |  169 ++
 .../schemas/ogc/iso/19139/20070417/gmx/crsItem.xsd | 1031 ++++++++
 .../{20060504 => 20070417}/gmx/extendedTypes.xsd   |    7 +-
 .../schemas/ogc/iso/19139/20070417/gmx/gmx.xsd     |   12 +
 .../ogc/iso/19139/20070417/gmx/gmxUsage.xsd        |  128 +
 .../schemas/ogc/iso/19139/20070417/gmx/uomItem.xsd |  163 ++
 .../schemas/ogc/iso/19139/20070417/gsr/ReadMe.txt  |   45 +
 .../schemas/ogc/iso/19139/20070417/gsr/gsr.xsd     |   12 +
 .../iso/19139/20070417/gsr/spatialReferencing.xsd  |   25 +
 .../schemas/ogc/iso/19139/20070417/gss/ReadMe.txt  |   44 +
 .../ogc/iso/19139/20070417/gss/geometry.xsd        |   36 +
 .../schemas/ogc/iso/19139/20070417/gss/gss.xsd     |   12 +
 .../schemas/ogc/iso/19139/20070417/gts/ReadMe.txt  |   44 +
 .../schemas/ogc/iso/19139/20070417/gts/gts.xsd     |   12 +
 .../ogc/iso/19139/20070417/gts/temporalObjects.xsd |   35 +
 .../ogc/iso/19139/20070417/resources/ReadMe.txt    |   20 +
 .../resources/codelist}/ML_gmxCodelists.xml        |   34 +-
 .../resources/codelist}/gmxCodelists.xml           |   44 +-
 .../20070417/resources/codelist/tcCodelists.xml    |   63 +
 .../resources/crs/ML_gmxCrs.xml                    |  105 +-
 .../resources/crs/gmxCrs.xml                       |   89 +-
 .../iso/19139/20070417/resources/example/fr-fr.xml |   83 +
 .../iso/19139/20070417/resources/uom/ML_gmxUom.xml |  125 +
 .../iso/19139/20070417/resources/uom/gmxUom.xml    |   66 +
 pycsw/plugins/profiles/ebrim/__init__.py           |    4 +-
 pycsw/plugins/profiles/ebrim/ebrim.py              |   27 +-
 .../ogc/csw/2.0.2/profiles/ebrim/1.0/csw-ebrim.xsd |    6 +-
 pycsw/plugins/profiles/profile.py                  |   34 +-
 pycsw/plugins/repository/__init__.py               |    4 +-
 pycsw/plugins/repository/geonode/__init__.py       |    4 +-
 pycsw/plugins/repository/geonode/geonode_.py       |    8 +-
 .../repository/hhypermap}/__init__.py              |    2 +-
 .../{odc/odc.py => hhypermap/hhypermap.py}         |   97 +-
 pycsw/plugins/repository/odc/__init__.py           |    4 +-
 pycsw/plugins/repository/odc/odc.py                |   10 +-
 pycsw/server.py                                    | 2675 ++++----------------
 pycsw/sru.py                                       |   23 +-
 csw.wsgi => pycsw/wsgi.py                          |   35 +-
 requirements-pg.txt                                |    1 +
 requirements-standalone.txt                        |    3 +-
 requirements.txt                                   |    8 +-
 setup.py                                           |   20 +-
 ...ites_apiso-inspire_get_GetCapabilities-lang.xml |  252 +-
 .../suites_apiso-inspire_get_GetCapabilities.xml   |  252 +-
 .../expected/suites_apiso_post_DescribeRecord.xml  |    2 +-
 .../expected/suites_apiso_post_GetCapabilities.xml |  252 +-
 .../suites_apiso_post_GetDomain-property.xml       |    2 +-
 .../suites_apiso_post_GetRecordById-brief.xml      |    2 +-
 .../suites_apiso_post_GetRecordById-full-dc.xml    |    3 +-
 .../suites_apiso_post_GetRecordById-full.xml       |    2 +-
 .../suites_apiso_post_GetRecordById-srv-brief.xml  |    2 +-
 ...suites_apiso_post_GetRecords-all-csw-output.xml |    2 +-
 .../expected/suites_apiso_post_GetRecords-all.xml  |    2 +-
 .../suites_apiso_post_GetRecords-cql-title.xml     |    2 +-
 .../suites_apiso_post_GetRecords-elementname.xml   |    2 +-
 ...cords-filter-and-nested-spatial-or-dateline.xml |    4 +-
 ...suites_apiso_post_GetRecords-filter-anytext.xml |    2 +-
 ...piso_post_GetRecords-filter-bbox-csw-output.xml |    2 +-
 .../suites_apiso_post_GetRecords-filter-bbox.xml   |    2 +-
 ...es_apiso_post_GetRecords-filter-servicetype.xml |    2 +-
 .../suites_atom_get_opensearch-description.xml     |   22 +-
 ...uites_atom_get_opensearch-ogc-bbox-and-time.xml |   38 +-
 .../suites_atom_get_opensearch-ogc-bbox.xml        |   54 +-
 ...tes_atom_get_opensearch-ogc-count-and-page1.xml |   27 +-
 ...tes_atom_get_opensearch-ogc-count-and-page2.xml |    8 +-
 .../suites_atom_get_opensearch-ogc-q-and-bbox.xml  |   21 +-
 .../suites_atom_get_opensearch-ogc-q-and-time.xml  |   10 +-
 .../expected/suites_atom_get_opensearch-ogc-q.xml  |   10 +-
 .../suites_atom_get_opensearch-ogc-time.xml        |   10 +-
 .../suites_atom_get_opensearch-ogc-timeend.xml     |   10 +-
 .../suites_atom_get_opensearch-ogc-timestart.xml   |   46 +-
 tests/expected/suites_atom_get_opensearch.xml      |   99 +-
 tests/expected/suites_atom_post_DescribeRecord.xml |    2 +-
 .../expected/suites_atom_post_GetCapabilities.xml  |  158 +-
 .../suites_atom_post_GetRecords-filter-bbox.xml    |   34 +-
 ...te_get_27e17158-c57a-4493-92ac-dba8934cf462.xml |  197 +-
 ...te_get_27f69b66-5f05-4311-a89c-73ca55c2686b.xml |    2 +-
 ...te_get_2ab7d1fa-885b-459f-80e4-b6282eab4f8c.xml |  197 +-
 ...te_get_37aa90e2-6ff0-420c-af15-8b9463099a73.xml |    2 +-
 ...te_get_3a8a3c47-455f-4f49-9078-03119f3e70b3.xml |  290 +--
 ...te_get_4515831f-834a-4699-95f6-ab0c2cbfcfd0.xml |    2 +-
 ...te_get_477b23a3-baa9-47c8-9541-5fe27735ed49.xml |  594 ++++-
 ...te_get_48f26761-3a9d-48db-bee1-da089f5fb857.xml |  197 +-
 ...te_get_4e38092f-1586-44b8-988e-0acfa5855916.xml |    2 +-
 ...te_get_55c38f00-2553-42c1-99ab-33edbb561ad7.xml |  647 +++--
 ...te_get_5ab5db18-c87a-4fbf-a8d8-b7289b09ac81.xml |   10 +-
 ...te_get_6a4f57ca-a1bd-4802-89c2-44860dbdb0f0.xml |    2 +-
 ...te_get_6c375703-9c00-4aef-bec7-d2e964f849eb.xml |   10 +-
 ...te_get_80f31def-4185-48b9-983a-960566918eae.xml |  824 +++---
 ...te_get_8e2232ed-05d9-44ae-8b04-0911cbe6a507.xml |   10 +-
 ...te_get_9697f0aa-3b6a-4125-83a5-61e8826127c4.xml |  824 +++---
 ...te_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml |    2 +-
 ...te_get_b81c3595-06d6-4693-82ea-1ff8650755ac.xml |    2 +-
 ...te_get_ba5fc729-3b71-47a0-b7d0-42ec565cd185.xml |  197 +-
 ...te_get_c4ea754f-c158-4d8d-8253-dc8f86021b52.xml |   10 +-
 ...te_get_f4692ec5-9547-4a05-88ab-e6154af2640a.xml |  197 +-
 ...te_get_f997f25e-c865-4d53-a362-0ed1846337f2.xml |    2 +-
 ...e_post_0c976d98-c896-4b10-b1fe-a22ef50434e7.xml |    2 +-
 ...e_post_19d2a6ed-be28-4866-ae15-e3bb634486cb.xml |    2 +-
 ...e_post_1ab55aa3-6685-4595-8ecd-45987a7b8b59.xml |    4 +-
 ...e_post_1c958b7a-ca09-4c38-98bd-ef1d1d28cc14.xml |    2 +-
 ...e_post_1c97fc1a-61cd-4c1d-8054-933e17a6c5ee.xml |    2 +-
 ...e_post_2102a460-5d62-465f-9668-d70b3faafbfa.xml |    2 +-
 ...e_post_225f455a-0035-486b-a94e-fee7ae881b2b.xml |    2 +-
 ...e_post_2d53ffea-60e4-4652-abf5-36eb23042fd5.xml |    2 +-
 ...e_post_34a019a9-1581-42cb-9827-fbfdda2773b7.xml |    2 +-
 ...e_post_3e76fd38-e035-41c9-83dc-61356f680c97.xml |    2 +-
 ...e_post_418a6fb0-a89c-4a94-afc9-3f8168eb2980.xml |    2 +-
 ...e_post_420b745e-0c4b-404e-9f2d-61fa580ff05a.xml |    2 +-
 ...e_post_4735d649-a2b1-42fd-a101-14e1d7e4607f.xml |    2 +-
 ...e_post_5c5861bc-f742-40a5-9998-5342615d674b.xml |    2 +-
 ...e_post_6e736fd0-c266-4852-9eb3-0656f5d0f5c4.xml |    2 +-
 ...e_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml |    2 +-
 ...e_post_78297c88-4850-4927-adc6-511cd9a3d539.xml |    2 +-
 ...e_post_7c89cdf5-0def-4cfb-8c55-2b8ffea5d92f.xml |   46 +-
 ...e_post_7e2cd105-daec-4d25-bc8e-d49d21364912.xml |    2 +-
 ...e_post_87f2f670-9cd6-4907-b82c-1b46a7dd2a78.xml |    2 +-
 ...e_post_88b4e1ba-3bd4-4cbe-81e5-e004056d6ca3.xml |    2 +-
 ...e_post_898cd63b-2585-4ec0-8720-d554bd324174.xml |    2 +-
 ...e_post_8fb13dc3-5818-45e2-9e29-46abc16e7d38.xml |    2 +-
 ...e_post_928c1896-52d4-4ac7-9832-f98e3eb65f02.xml |    2 +-
 ...e_post_93bdbb9d-2734-4f01-92fb-48634cca41de.xml |    2 +-
 ...e_post_948b39d5-bb4f-45b8-a8f2-4ff9501aaedd.xml |    2 +-
 ...e_post_9fd64fcc-f69c-4626-b72e-5c7776a29aa9.xml |    2 +-
 ...e_post_a06d04ab-e0d0-4a86-bfe8-71460f41fe37.xml |    2 +-
 ...e_post_ad61686c-d304-42d1-b845-8c1f3070c83e.xml |    2 +-
 ...e_post_af39c020-7b1d-429c-b474-f45c3164cb79.xml |    2 +-
 ...e_post_b90e2de6-3d25-4298-a13e-dc9492a8fc73.xml |    2 +-
 ...e_post_ba9b0107-dcee-46ef-823a-a2e25a911a96.xml |    2 +-
 ...e_post_bb66ebc5-7121-48b5-9f53-b56537d9561b.xml |    2 +-
 ...e_post_c02d1c85-df9f-45ee-bea7-345c35e02a98.xml |    2 +-
 ...e_post_c311a342-72e3-4983-be39-868e6ed9740f.xml |    2 +-
 ...e_post_c38916c2-4bc6-446d-b7aa-ab006d6ba31c.xml |    2 +-
 ...e_post_c8588f47-8e65-45f5-ad34-ff4524cad84d.xml |    2 +-
 ...e_post_da228d4c-e1be-43d7-9ccb-c3f27ee32541.xml |    2 +-
 ...e_post_dc92c2c4-87d8-4a13-964e-ff9b0e0c27b3.xml |    2 +-
 ...e_post_dcb13791-379e-4739-bcd4-dbaa69f0efdb.xml |    2 +-
 ...e_post_e308f030-c097-4036-a838-44bad74c9ef7.xml |    2 +-
 ...e_post_e6e9efb2-e2b7-4b0a-a3a2-7deea3f9b8e2.xml |    2 +-
 ...e_post_f7976c55-a156-4421-8199-bc0487da4b0f.xml |    2 +-
 ...e_post_f7d79701-f10b-4087-a33c-f62df0a04fd1.xml |    2 +-
 ...e_post_fc1bc094-88f1-4851-bc2b-dfc56be9f3c7.xml |    2 +-
 ...e_post_fe20960f-a26c-4f13-852d-470a0d3233f9.xml |    2 +-
 ...30_get_002258f0-627f-457f-b2ad-025777c77ac8.xml |   15 +
 ...30_get_045c600d-973d-41eb-9f60-eba1b717b720.xml |   24 +
 ...30_get_0bbcf862-5211-4351-9988-63f8bec49c98.xml |  116 +
 ...30_get_0bdf8457-971e-4ed1-be4a-5feca4dcd8fa.xml |  491 ++++
 ...30_get_0d8bbdec-0846-42ca-8dc8-b7f4cba41d67.xml |   47 +
 ...30_get_0e1dca37-477a-4060-99fe-7799b52d656c.xml |   15 +
 ...0_get_13c87956-51a4-4780-a8e9-6e0b5c0bb473.xml} |   77 +-
 ...30_get_151d982f-ebd3-4cb2-b507-a667713a1e92.xml |    7 +
 ...30_get_1869e495-1a61-4713-8285-76d1336ee1a6.xml |    7 +
 ...30_get_1bcb42a9-538c-4f0a-9d4c-d6f10b720aa6.xml |    7 +
 ...30_get_22f44168-2ccf-4801-ad96-204212566d56.xml |  491 ++++
 ...30_get_2499a9c9-8d33-449c-bc92-d494adfcc84d.xml |  491 ++++
 ...30_get_27f4f39c-d92a-4e3c-b961-c6aa8c24e513.xml |  491 ++++
 ...30_get_28e569df-8596-4128-8d9a-29ad03138915.xml |    8 +
 ...30_get_2b06a5c8-0df2-4af1-8d2e-a425de11c845.xml |  491 ++++
 ...30_get_2ba1418a-444d-4cce-9cfe-4c94efcf8b55.xml |   32 +
 ...30_get_397fe17a-d5b4-4f96-8cc4-4ce467ed4d0a.xml |   30 +
 ...30_get_3dcd1b15-73d2-4b7d-a3e3-ff15bf14aae4.xml |   69 +
 ...30_get_405e1ff1-5c75-4846-a28b-cfaff2a6921a.xml |   23 +
 ...30_get_43cd6471-6ac7-45bd-8ff9-148cb2de9a52.xml |  491 ++++
 ...30_get_4566d2ec-1283-4a02-baed-a74fc5b47e37.xml |   18 +
 ...30_get_461bd4c5-6623-490d-9036-d91a2201e87b.xml |    3 +
 ...30_get_5496894a-3877-4f62-a20b-5d7126f94925.xml |    7 +
 ...30_get_5a015f6a-bf14-4977-b1e3-6577eb0223c8.xml |   40 +
 ...30_get_5c3a2390-1fb9-43f0-b96c-f48c7a69c990.xml |    7 +
 ...30_get_5e9e67dc-18d6-4645-8111-c6263c88a61f.xml |  326 +++
 ...30_get_604d9379-741c-42e5-b4cf-92e56c87fa64.xml |   32 +
 ...30_get_60e6af95-d5fc-465a-82e2-fd2e6d85e4af.xml |    7 +
 ...30_get_62ad94c2-b558-4265-a427-23d6677975d6.xml |    7 +
 ...30_get_6a5e247b-0961-4b8a-a0d6-35a491d9cfe7.xml |    7 +
 ...30_get_6a9d0558-9d87-495b-b999-b49a3ef1cf99.xml |  491 ++++
 ...30_get_6bd790c9-6019-4652-9c91-330a894d6700.xml |   16 +
 ...30_get_6e9cba43-5e27-415d-adbd-a92851c2c173.xml |  491 ++++
 ...30_get_7630d230-e142-4a09-accf-f091000b90cd.xml |   10 +
 ...30_get_7e82446a-b5dc-43fe-9a73-4cc1f2f2f0bf.xml |  491 ++++
 ...30_get_8025978e-1a35-4d70-80c2-e8329e0c7864.xml |  491 ++++
 ...30_get_8184ae4f-536d-4978-8b28-ad703be96967.xml |   34 +
 ...30_get_88f63a89-664f-4315-b4f8-04a0b33803a7.xml |   18 +
 ...30_get_8987f8f0-4d93-4481-968c-a2ccbd6b8be2.xml |    7 +
 ...30_get_8e5fa0f6-3f29-4d1f-abe2-d9866f3def98.xml |   58 +
 ...30_get_9000ec29-5649-474e-b2d6-55c00f8a52c0.xml |    7 +
 ...30_get_91914d35-7bbf-45e6-9b37-5ef484869a4e.xml |   38 +
 ...30_get_92d4844d-57d5-4cf3-8f47-ba50e369dc04.xml |    6 +
 ...30_get_9c0e2a4b-b4e6-41c0-b630-c8c99fc89ff3.xml |    7 +
 ...30_get_9d7ffac8-9798-428d-8e27-3cd12497ee6b.xml |    7 +
 ...w30_get_Exception-GetDomain-value-reference.xml |    7 +
 .../suites_csw30_get_Exception-GetDomain.xml       |    7 +
 ...uites_csw30_get_Exception-GetRecordById-404.xml |    7 +
 ...es_csw30_get_Exception-GetRecordById-dc.xml.xml |    9 +
 ...30_get_Exception-GetRepositoryItem-notfound.xml |    7 +
 .../suites_csw30_get_Exception-invalid-request.xml |    7 +
 .../suites_csw30_get_GetCapabilities-base-url.xml  |  491 ++++
 ...suites_csw30_get_GetCapabilities-no-version.xml |  491 ++++
 .../expected/suites_csw30_get_GetCapabilities.xml  |  491 ++++
 .../suites_csw30_get_GetDomain-parameter.xml       |   12 +
 .../suites_csw30_get_GetDomain-value-reference.xml |   18 +
 .../suites_csw30_get_GetRepositoryItem.xml         |   11 +
 .../suites_csw30_get_OpenSearch-description.xml    |   15 +
 ...30_get_a2f18643-e24e-4fa5-b780-6de4a2dbc814.xml |    9 +
 ...30_get_abc90c8c-5868-4405-a73e-64c849be3b2a.xml |    7 +
 ...30_get_ad0c0571-09ed-436a-9a4f-a5de744c88fe.xml |   22 +
 ...30_get_af502903-f4ee-47ee-b76e-af878d238bcc.xml |   40 +
 ...30_get_b2aafc3f-4f35-47bc-affd-08590972deae.xml |   58 +
 ...30_get_b6069623-f7d8-4021-8582-98f0aea0f763.xml |   48 +
 ...30_get_b9a07a54-75a8-45bd-b341-2823600211e3.xml |    8 +
 ...30_get_baa4a7d0-0c01-42b6-adc3-0d03e9949fa3.xml |    7 +
 ...30_get_bfbe6409-f64a-4c89-acb3-50f260a5c743.xml |   15 +
 ...30_get_bfe20134-d1da-42ef-9c0f-8e1307bbf92b.xml |   38 +
 ...30_get_c03d173a-3f42-4956-89c8-1fe02c3a0873.xml |  491 ++++
 ...30_get_cb43d8c3-e14c-4a9f-9231-4384b7dd21f3.xml |    7 +
 ...30_get_d03c6fd3-e821-4a26-b62f-d20a474e25af.xml |   30 +
 ...30_get_d4ccbf96-a529-480e-a53d-5b88dc1dea7f.xml |    7 +
 ...30_get_d94c801a-1207-4897-b84a-53f3a192515b.xml |    6 +
 ...30_get_da859e34-91fc-495a-8c09-285a40c0900b.xml |   14 +
 ...30_get_dc246fb8-5af5-4fda-82bb-c18b3ecd439c.xml |   40 +
 ...30_get_de016645-6d5c-4855-943c-2db07ae9f49a.xml |   30 +
 ...0_get_dff3ec6b-bb2d-4887-bd17-8fcf15def042.xml} |   74 +-
 ...30_get_e38e6bfb-8ac4-4ae4-8b87-0aafbc8d3c6b.xml |   11 +
 ...30_get_e67ca935-d65d-4d8c-8302-1405333dded0.xml |  491 ++++
 ...30_get_e7704509-3441-458f-8ef0-e333c6b6043f.xml |    7 +
 ...30_get_f1223a49-6d08-44ff-97fe-4c32cbbfad82.xml |    6 +
 ...30_get_f89dd4e1-3a81-4433-afd2-a3fa1bdb1e18.xml |    7 +
 ..._post_Exception-GetDomain-parametername-bad.xml |    7 +
 ...post_Exception-GetDomain-valuereference-bad.xml |    7 +
 ...ites_csw30_post_Exception-GetRecordById-404.xml |    7 +
 ..._csw30_post_Exception-GetRecordById-bad-esn.xml |    7 +
 .../suites_csw30_post_Exception-bad-xml.xml        |    8 +
 .../suites_csw30_post_Exception-not-xml.xml        |    8 +
 .../expected/suites_csw30_post_GetCapabilities.xml |  491 ++++
 .../suites_csw30_post_GetDomain-parametername.xml  |   12 +
 .../suites_csw30_post_GetDomain-valuereference.xml |   18 +
 .../suites_csw30_post_GetRecordById-dc-full.xml    |   10 +
 .../suites_csw30_post_GetRecordById-dc.xml         |   10 +
 ...lt_get_Exception-GetRepositoryItem-notfound.xml |    7 +
 ...default_get_GetCapabilities-invalid-request.xml |    2 +-
 .../suites_default_get_GetCapabilities.xml         |  158 +-
 .../expected/suites_default_get_GetRecords-all.xml |    2 +-
 ...tes_default_get_GetRecords-empty-maxrecords.xml |    6 +
 .../suites_default_get_GetRecords-filter.xml       |    2 +-
 .../suites_default_get_GetRecords-sortby-asc.xml   |    2 +-
 .../suites_default_get_GetRecords-sortby-desc.xml  |    2 +-
 ...default_get_GetRecords-sortby-invalid-order.xml |    2 +-
 ..._get_GetRecords-sortby-invalid-propertyname.xml |    2 +-
 .../suites_default_get_GetRepositoryItem.xml       |   14 +
 .../suites_default_post_DescribeRecord-json.xml    |  595 ++---
 .../suites_default_post_DescribeRecord.xml         |    2 +-
 ...efault_post_Exception-GetRecords-badsrsname.xml |    2 +-
 ...fault_post_Exception-GetRecords-elementname.xml |    2 +-
 ...fault_post_Exception-GetRecords-invalid-xml.xml |    2 +-
 .../suites_default_post_GetCapabilities-SOAP.xml   |  158 +-
 ...uites_default_post_GetCapabilities-sections.xml |    8 +-
 ...default_post_GetCapabilities-updatesequence.xml |  158 +-
 .../suites_default_post_GetCapabilities.xml        |  158 +-
 .../suites_default_post_GetDomain-parameter.xml    |    4 +-
 .../suites_default_post_GetDomain-property.xml     |    2 +-
 .../suites_default_post_GetRecordById-json.xml     |   62 +-
 .../expected/suites_default_post_GetRecordById.xml |    2 +-
 .../suites_default_post_GetRecords-all-json.xml    |  227 +-
 ...default_post_GetRecords-all-resulttype-hits.xml |    2 +-
 ...ult_post_GetRecords-all-resulttype-validate.xml |    2 +-
 ...tes_default_post_GetRecords-all-sortby-bbox.xml |    2 +-
 .../suites_default_post_GetRecords-all.xml         |    2 +-
 ...s_default_post_GetRecords-bbox-filter-crs84.xml |    2 +-
 .../suites_default_post_GetRecords-cql-title.xml   |    2 +-
 ...s_default_post_GetRecords-distributedsearch.xml |    4 +-
 .../suites_default_post_GetRecords-elementname.xml |    2 +-
 .../suites_default_post_GetRecords-end.xml         |    2 +-
 ...lt_post_GetRecords-filter-and-bbox-freetext.xml |    2 +-
 ...efault_post_GetRecords-filter-and-nested-or.xml |    2 +-
 ...fault_post_GetRecords-filter-and-nested-or2.xml |    2 +-
 ...ault_post_GetRecords-filter-anytext-and-not.xml |    2 +-
 ...efault_post_GetRecords-filter-anytext-equal.xml |    2 +-
 ...ites_default_post_GetRecords-filter-anytext.xml |    2 +-
 ...fault_post_GetRecords-filter-bbox-reproject.xml |    2 +-
 ..._default_post_GetRecords-filter-bbox-sortby.xml |    2 +-
 .../suites_default_post_GetRecords-filter-bbox.xml |    2 +-
 ...ites_default_post_GetRecords-filter-between.xml |    2 +-
 ...default_post_GetRecords-filter-function-bad.xml |    2 +-
 ...tes_default_post_GetRecords-filter-function.xml |    2 +-
 ...tes_default_post_GetRecords-filter-not-bbox.xml |    2 +-
 ...ult_post_GetRecords-filter-or-bbox-freetext.xml |    2 +-
 ...efault_post_GetRecords-filter-or-nested-and.xml |    2 +-
 ...lt_post_GetRecords-filter-or-title-abstract.xml |    2 +-
 .../suites_default_post_GetRecords-maxrecords.xml  |    2 +-
 .../suites_default_post_GetRecords-requestid.xml   |    2 +-
 .../suites_default_post_Harvest-default.xml        |    2 +-
 ...uites_default_post_Harvest-response-handler.xml |    2 +-
 .../suites_default_post_Transaction-delete.xml     |    2 +-
 .../suites_default_post_Transaction-insert.xml     |    2 +-
 ...suites_default_post_Transaction-update-full.xml |    2 +-
 ...ault_post_Transaction-update-recordproperty.xml |    2 +-
 tests/expected/suites_dif_post_DescribeRecord.xml  |    2 +-
 tests/expected/suites_dif_post_GetCapabilities.xml |  158 +-
 .../suites_dif_post_GetRecords-filter-bbox.xml     |    2 +-
 .../expected/suites_ebrim_post_DescribeRecord.xml  |    8 +-
 .../expected/suites_ebrim_post_GetCapabilities.xml |  162 +-
 ...ites_ebrim_post_GetRecords-filter-bbox-full.xml |    2 +-
 .../suites_ebrim_post_GetRecords-filter-bbox.xml   |    2 +-
 tests/expected/suites_fgdc_post_DescribeRecord.xml |    2 +-
 .../expected/suites_fgdc_post_GetCapabilities.xml  |  158 +-
 .../suites_fgdc_post_GetRecords-filter-bbox.xml    |    2 +-
 ...es.xml => suites_gm03_post_GetCapabilities.xml} |  174 +-
 .../suites_gm03_post_GetRecords-filter-bbox.xml    |  137 +
 ..._get_Exception-Harvest-invalid-resourcetype.xml |    4 +-
 ..._get_Exception-Harvest-missing-resourcetype.xml |    2 +-
 ...esting_get_Exception-Harvest-missing-source.xml |    2 +-
 ...vesting_get_Exception-Harvest-waf-bad-value.xml |    2 +-
 ..._get_Exception-Harvest-waf-no-records-found.xml |    2 +-
 ...suites_harvesting_post_Clear-000-delete-all.xml |    2 +-
 ...es_harvesting_post_Exception-Havest-csw-404.xml |    2 +-
 .../suites_harvesting_post_GetCapabilities.xml     |   41 +-
 .../suites_harvesting_post_GetDomain-parameter.xml |   11 +-
 .../suites_harvesting_post_Harvest-csw-iso.xml     |  160 +-
 .../suites_harvesting_post_Harvest-csw-run1.xml    |    4 +-
 .../suites_harvesting_post_Harvest-csw-run2.xml    |    2 +-
 .../expected/suites_harvesting_post_Harvest-dc.xml |    2 +-
 .../suites_harvesting_post_Harvest-fgdc.xml        |    2 +-
 .../suites_harvesting_post_Harvest-iso.xml         |    2 +-
 .../suites_harvesting_post_Harvest-rdf.xml         |    2 +-
 .../suites_harvesting_post_Harvest-sos100.xml      |    2 +-
 .../suites_harvesting_post_Harvest-sos200.xml      |    2 +-
 .../suites_harvesting_post_Harvest-waf.xml         |    2 +-
 .../suites_harvesting_post_Harvest-wcs.xml         |    2 +-
 .../suites_harvesting_post_Harvest-wfs.xml         |    2 +-
 .../suites_harvesting_post_Harvest-wms-run1.xml    |   10 +-
 .../suites_harvesting_post_Harvest-wms-run2.xml    |    2 +-
 .../suites_harvesting_post_Harvest-wmts.xml        |  713 ++++++
 .../suites_harvesting_post_Harvest-wps.xml         |    2 +-
 ...t_Harvest-zzz-post-GetRecords-filter-ows-dc.xml |   25 +-
 ...-zzz-post-GetRecords-filter-sos-abstract-dc.xml |    2 +-
 ...t_Harvest-zzz-post-GetRecords-filter-sos-dc.xml |    2 +-
 ..._Harvest-zzz-post-GetRecords-filter-sos-iso.xml |    2 +-
 ..._Harvest-zzz-post-GetRecords-filter-wfs-iso.xml |   10 +-
 ...t_Harvest-zzz-post-GetRecords-filter-wms-dc.xml |   68 +-
 ..._Harvest-zzz-post-GetRecords-filter-wms-iso.xml | 1065 +++++++-
 ...arvest-zzz-post-GetRecords-filter-wms-layer.xml |    2 +-
 ..._harvesting_post_Transaction-000-delete-all.xml |    4 +-
 .../suites_manager_post_Clear-000-delete-all.xml   |    2 +-
 .../suites_manager_post_GetCapabilities.xml        |  293 ++-
 .../suites_manager_post_GetDomain-parameter.xml    |   25 +-
 ...tes_manager_post_Transaction-000-delete-all.xml |    2 +-
 ...uites_manager_post_Transaction-dc-01-insert.xml |    2 +-
 ..._manager_post_Transaction-dc-02-update-full.xml |    2 +-
 ...tes_manager_post_Transaction-fgdc-01-insert.xml |    2 +-
 ...ger_post_Transaction-fgdc-02-update-recprop.xml |    2 +-
 ...manager_post_Transaction-fgdc-03-delete-all.xml |    2 +-
 ..._manager_post_Transaction-iso-00-delete-all.xml |    2 +-
 ...ites_manager_post_Transaction-iso-01-insert.xml |    2 +-
 ...manager_post_Transaction-iso-02-update-full.xml |    2 +-
 ...ager_post_Transaction-iso-03-update-recprop.xml |    2 +-
 ...ransaction-iso-04-update-recprop-no-matches.xml |    2 +-
 ...ites_manager_post_Transaction-iso-05-delete.xml |    2 +-
 ...tes_manager_post_Transaction-xxx-delete-all.xml |    2 +-
 ...es_oaipmh_get_GetRecord_bad_metadata_prefix.xml |    2 +-
 tests/expected/suites_oaipmh_get_GetRecord_dc.xml  |    2 +-
 tests/expected/suites_oaipmh_get_GetRecord_iso.xml |    2 +-
 .../suites_oaipmh_get_GetRecord_oai_dc.xml         |    2 +-
 tests/expected/suites_oaipmh_get_Identify.xml      |    2 +-
 ...pmh_get_ListIdentifiers_bad_metadata_prefix.xml |    2 +-
 .../suites_oaipmh_get_ListIdentifiers_dc.xml       |    2 +-
 .../suites_oaipmh_get_ListIdentifiers_iso.xml      |    2 +-
 ...get_ListIdentifiers_missing_metadata_prefix.xml |    2 +-
 .../suites_oaipmh_get_ListIdentifiers_oai_dc.xml   |    2 +-
 .../suites_oaipmh_get_ListMetadataFormats.xml      |   29 +-
 .../expected/suites_oaipmh_get_ListRecords_dc.xml  |    2 +-
 ...ipmh_get_ListRecords_dc_bad_metadata_prefix.xml |    2 +-
 .../suites_oaipmh_get_ListRecords_iso19139.xml     |    2 +-
 .../suites_oaipmh_get_ListRecords_oai_dc.xml       |    2 +-
 tests/expected/suites_oaipmh_get_ListSets.xml      |    2 +-
 tests/expected/suites_oaipmh_get_bad_verb.xml      |    2 +-
 tests/expected/suites_oaipmh_get_empty.xml         |    2 +-
 .../expected/suites_oaipmh_get_empty_with_amp.xml  |    2 +-
 tests/expected/suites_oaipmh_get_illegal_verb.xml  |    2 +-
 ...suites_repofilter_post_GetRecordById-masked.xml |    2 +-
 .../suites_repofilter_post_GetRecords-all.xml      |    2 +-
 tests/expected/suites_sru_get_explain.xml          |   78 +-
 tests/expected/suites_sru_get_search.xml           |    8 +-
 tests/expected/suites_sru_get_search_cql.xml       |   36 +-
 .../expected/suites_sru_get_search_maxrecords.xml  |   36 +-
 ...uites_sru_get_search_startrecord_maxrecords.xml |   36 +-
 .../expected/suites_utf-8_post_GetCapabilities.xml |  158 +-
 tests/gen_html.py                                  |   34 +-
 tests/index.html                                   |   99 +
 tests/run_tests.py                                 |  433 +++-
 tests/suites/apiso/data/README.txt                 |    7 +
 tests/suites/cite/data/README.txt                  |   65 +
 tests/suites/cite/data/{records.db => cite.db}     |  Bin
 .../suites/csw30/default.cfg                       |   60 +-
 tests/suites/csw30/get/requests.txt                |   82 +
 .../post/Exception-GetDomain-parametername-bad.xml |    4 +
 .../Exception-GetDomain-valuereference-bad.xml     |    4 +
 .../csw30/post/Exception-GetRecordById-404.xml     |    4 +
 .../csw30/post/Exception-GetRecordById-bad-esn.xml |    5 +
 tests/suites/csw30/post/Exception-bad-xml.xml      |    9 +
 tests/suites/csw30/post/Exception-not-xml.xml      |    1 +
 tests/suites/csw30/post/GetCapabilities.xml        |    9 +
 .../suites/csw30/post/GetDomain-parametername.xml  |    4 +
 .../suites/csw30/post/GetDomain-valuereference.xml |    4 +
 tests/suites/csw30/post/GetRecordById-dc-full.xml  |    5 +
 tests/suites/csw30/post/GetRecordById-dc.xml       |    4 +
 tests/suites/default/get/requests.txt              |    3 +
 .../suites/gm03/default.cfg                        |   60 +-
 tests/suites/gm03/post/GetCapabilities.xml         |    9 +
 tests/suites/gm03/post/GetRecords-filter-bbox.xml  |   17 +
 tests/suites/harvesting/post/Harvest-csw-iso.xml   |    5 +-
 tests/suites/harvesting/post/Harvest-wmts.xml      |    6 +
 636 files changed, 42191 insertions(+), 8146 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..6f75fc0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
+# Description
+
+# Environment
+
+- operating system:
+- Python version:
+- pycsw version:
+- source/distribution
+ - [ ] git clone
+ - [ ] DebianGIS/UbuntuGIS
+ - [ ] PyPI
+ - [ ] zip/tar.gz
+ - [ ] other (please specify):
+- web server
+ - [ ] Apache/mod_wsgi
+ - [ ] CGI
+ - [ ] other (please specify): 
+
+# Steps to Reproduce
+
+# Additional Information
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..4042f50
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,12 @@
+# Overview
+
+# Related Issue / Discussion
+
+# Additional Information
+
+# Contributions and Licensing
+
+(as per https://github.com/geopython/pycsw/blob/master/CONTRIBUTING.rst#contributions-and-licensing)
+
+- [ ] I'd like to contribute [feature X|bugfix Y|docs|something else] to pycsw. I confirm that my contributions to pycsw will be compatible with the pycsw license guidelines at the time of contribution.
+- [ ] I have already previously agreed to the pycsw Contributions and Licensing Guidelines
diff --git a/.travis.yml b/.travis.yml
index a25d57d..c34d7b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,31 @@
 language: python
 
+sudo: required
+dist: trusty
+
 python:
-  - "2.7"
   - "2.6"
+  - "2.7"
+  - "3.4"
 
-install:
-  - sudo apt-get install -y libgeos-c1
-  - pip install . --use-mirrors
-  - pip install -r ./requirements-standalone.txt
-  - pip install -r ./requirements-dev.txt
-  - python ./setup.py -q install
+#matrix:
+#  allow_failures:
+#    - python: "3.4"
 
-#before_script:
-#  - paver start
+addons:
+  apt:
+    packages:
+      - libgeos-c1
+      - libxml2-dev
+
+before_script:
+  - pycsw-admin.py -c get_sysprof
+
+install:
+  - pip install -r requirements.txt
+  - pip install -r requirements-dev.txt
+  - pip install -r requirements-standalone.txt
+  - python setup.py -q install
 
 script:
   - paver test
@@ -23,6 +36,5 @@ after_script:
 notifications:
   irc:
     channels:
-      #- "irc.freenode.org#geopython"
       - "irc.freenode.org#pycsw"
     use_notice: true
diff --git a/COMMITTERS.txt b/COMMITTERS.txt
index 4fb8b80..b0474d9 100644
--- a/COMMITTERS.txt
+++ b/COMMITTERS.txt
@@ -1,7 +1,8 @@
-============ ===================== =========================== ==================================
-Login(s)     Name                  Email / Contact             Area(s)
-============ ===================== =========================== ==================================
-tomkralidis  Tom Kralidis          tomkralidis at gmail.com    Overall 
-kalxas       Angelos Tzotsos       tzotsos at gmail.com        INSPIRE, APISO profiles, Packaging 
-adamhinz     Adam Hinz             hinz dot adam at gmail.com  WSGI/Server Deployment
-============ ===================== =========================== ==================================
+============== ===================== ================================== ==================================
+Login(s)       Name                  Email / Contact                    Area(s)
+============== ===================== ================================== ==================================
+tomkralidis    Tom Kralidis          tomkralidis at gmail.com           Overall 
+kalxas         Angelos Tzotsos       tzotsos at gmail.com               INSPIRE, APISO profiles, Packaging 
+adamhinz       Adam Hinz             hinz dot adam at gmail.com         WSGI/Server Deployment
+ricardogsilva  Ricardo Garcia Silva  ricardo.garcia.silva at gmail.com  Overall
+============== ===================== ================================== ==================================
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 306f819..e551cc6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -3,7 +3,7 @@ Contributing to pycsw
 
 The pycsw project openly welcomes contributions (bug reports, bug fixes, code
 enhancements/features, etc.).  This document will outline some guidelines on
-contributing to pycsw.  As well, pycsw `community </community.html>`_ is a great place to
+contributing to pycsw.  As well, the pycsw `community </community.html>`_ is a great place to
 get an idea of how to connect and participate in pycsw community and development.
 
 pycsw has the following modes of contribution:
@@ -11,6 +11,11 @@ pycsw has the following modes of contribution:
 - GitHub Commit Access
 - GitHub Pull Requests
 
+Code of Conduct
+---------------
+
+Contributors to this project are expected to act respectfully toward others in accordance with the `OSGeo Code of Conduct <http://www.osgeo.org/code_of_conduct>`_.
+
 Contributions and Licensing
 ---------------------------
 
@@ -102,24 +107,24 @@ This section will guide you through steps of working on pycsw.  This section ass
 .. code-block:: bash
 
   # setup a virtualenv
-  $ virtualenv mypycsw && cd mypycsw
-  $ . ./bin/activate
+  virtualenv mypycsw && cd mypycsw
+  . ./bin/activate
   # clone the repository locally
-  $ git clone git at github.com:USERNAME/pycsw.git
-  $ cd pycsw
-  $ pip install -e . && pip install -r requirements-standalone.txt
+  git clone git at github.com:USERNAME/pycsw.git
+  cd pycsw
+  pip install -e . && pip install -r requirements-standalone.txt
   # add the main pycsw master branch to keep up to date with upstream changes
-  $ git remote add upstream https://github.com/geopython/pycsw.git
-  $ git pull upstream master
+  git remote add upstream https://github.com/geopython/pycsw.git
+  git pull upstream master
   # create a local branch off master
   # The name of the branch should include the issue number if it exists
-  $ git branch 72-foo
-  $ git checkout 72-foo
+  git branch issue-72
+  git checkout issue-72
   # 
   # make code/doc changes
   #
-  $ git commit -am 'fix xyz (#72-foo)'
-  $ git push origin 72-foo
+  git commit -am 'fix xyz (#72)'
+  git push origin issue-72
 
 Your changes are now visible on your pycsw repository on GitHub.  You are now ready to create a pull request.
 A member of the pycsw team will review the pull request and provide feedback / suggestions if required.  If changes are
@@ -130,8 +135,8 @@ your own repository to ensure your pycsw repository is up to date with pycsw mas
 
 .. code-block:: bash
 
-  $ git checkout master
-  $ git pull upstream master
+  git checkout master
+  git pull upstream master
 
 .. _`Corporate`: http://www.osgeo.org/sites/osgeo.org/files/Page/corporate_contributor.txt
 .. _`Individual`: http://www.osgeo.org/sites/osgeo.org/files/Page/individual_contributor.txt
diff --git a/LICENSE.txt b/LICENSE.txt
index 1400127..a7e635b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,9 @@
 The MIT License (MIT)
 
-Copyright (c) 2010-2014 Tom Kralidis
+Copyright (c) 2010-2015 Tom Kralidis
+Copyright (c) 2011-2015 Angelos Tzotsos
+Copyright (c) 2012-2015 Adam Hinz
+Copyright (c) 2015      Ricardo Garcia Silva
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/VERSION.txt b/VERSION.txt
index 18b3114..5d8955f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.10.4
+2.0.0-alpha1
diff --git a/bin/pycsw-admin.py b/bin/pycsw-admin.py
index 2a18a9f..65481bd 100755
--- a/bin/pycsw-admin.py
+++ b/bin/pycsw-admin.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #          Angelos Tzotsos <tzotsos at gmail.com>
 #
-# Copyright (c) 2012 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -30,12 +30,13 @@
 #
 # =================================================================
 
-import ConfigParser
+from six.moves import configparser
+from six.moves import input
 import getopt
 import logging
 import sys
 
-from pycsw import admin, config
+from pycsw.core import admin, config
 
 logging.basicConfig(format='%(message)s', level=logging.DEBUG)
 
@@ -72,7 +73,7 @@ SYNOPSIS
 
     -o    path to output file
 
-    -p    path to input/output directory to read/write metadata records
+    -p    path to input/output directory or file to read/write metadata records
 
     -r    load records from directory recursively
 
@@ -93,7 +94,7 @@ EXAMPLES
 
         pycsw-admin.py -c setup_db -f default.cfg
         
-    2.) load_records: Loads metadata records from directory into repository
+    2.) load_records: Loads metadata records from directory or file into repository
 
         pycsw-admin.py -c load_records -p /path/to/records -f default.cfg
 
@@ -105,6 +106,10 @@ EXAMPLES
 
         pycsw-admin.py -c load_records -p /path/to/records -f default.cfg -y
 
+        Load metadata record from file into repository
+
+        pycsw-admin.py -c load_records -p /path/to/file.xml -f default.cfg
+
     3.) export_records: Dump metadata records from repository into directory
 
         pycsw-admin.py -c export_records -p /path/to/records -f default.cfg
@@ -160,14 +165,14 @@ TIMEOUT = 30
 FORCE_CONFIRM = False
 
 if len(sys.argv) == 1:
-    print usage()
+    print(usage())
     sys.exit(1)
 
 try:
     OPTS, ARGS = getopt.getopt(sys.argv[1:], 'c:f:ho:p:ru:x:s:t:y')
 except getopt.GetoptError as err:
-    print '\nERROR: %s' % err
-    print usage()
+    print('\nERROR: %s' % err)
+    print(usage())
     sys.exit(2)
 
 for o, a in OPTS:
@@ -190,13 +195,13 @@ for o, a in OPTS:
     if o == '-t':
         TIMEOUT = int(a)
     if o == '-h':  # dump help and exit
-        print usage()
+        print(usage())
         sys.exit(3)
     if o == '-y':
         FORCE_CONFIRM = True
 
 if COMMAND is None:
-    print '-c <command> is a required argument'
+    print('-c <command> is a required argument')
     sys.exit(4)
 
 if COMMAND not in ['setup_db', 'load_records', 'export_records',
@@ -204,24 +209,25 @@ if COMMAND not in ['setup_db', 'load_records', 'export_records',
                    'refresh_harvested_records', 'gen_sitemap',
                    'post_xml', 'get_sysprof',
                    'validate_xml', 'delete_records']:
-    print 'ERROR: invalid command name: %s' % COMMAND
+    print('ERROR: invalid command name: %s' % COMMAND)
     sys.exit(5)
 
 if CFG is None and COMMAND not in ['post_xml', 'get_sysprof', 'validate_xml']:
-    print 'ERROR: -f <cfg> is a required argument'
+    print('ERROR: -f <cfg> is a required argument')
     sys.exit(6)
 
 if COMMAND in ['load_records', 'export_records'] and XML_DIRPATH is None:
-    print 'ERROR: -p </path/to/records> is a required argument'
+    print('ERROR: -p </path/to/records> is a required argument')
     sys.exit(7)
 
 if COMMAND == 'gen_sitemap' and OUTPUT_FILE is None:
-    print 'ERROR: -o </path/to/sitemap.xml> is a required argument'
+    print('ERROR: -o </path/to/sitemap.xml> is a required argument')
     sys.exit(8)
 
 if COMMAND not in ['post_xml', 'get_sysprof', 'validate_xml']:
-    SCP = ConfigParser.SafeConfigParser()
-    SCP.readfp(open(CFG))
+    SCP = configparser.SafeConfigParser()
+    with open(CFG) as f:
+        SCP.readfp(f)
 
     DATABASE = SCP.get('repository', 'database')
     URL = SCP.get('server', 'url')
@@ -229,31 +235,31 @@ if COMMAND not in ['post_xml', 'get_sysprof', 'validate_xml']:
     METADATA = dict(SCP.items('metadata:main'))
     try:
         TABLE = SCP.get('repository', 'table')
-    except ConfigParser.NoOptionError:
+    except configparser.NoOptionError:
         TABLE = 'records'
 
 elif COMMAND not in ['get_sysprof', 'validate_xml']:
     if CSW_URL is None:
-        print 'ERROR: -u <http://host/csw> is a required argument'
+        print('ERROR: -u <http://host/csw> is a required argument')
         sys.exit(9)
     if XML is None:
-        print 'ERROR: -x /path/to/request.xml is a required argument'
+        print('ERROR: -x /path/to/request.xml is a required argument')
         sys.exit(10)
 elif COMMAND == 'validate_xml':
     if XML is None:
-        print 'ERROR: -x /path/to/file.xml is a required argument'
+        print('ERROR: -x /path/to/file.xml is a required argument')
         sys.exit(11)
     if XSD is None:
-        print 'ERROR: -s /path/to/file.xsd is a required argument'
+        print('ERROR: -s /path/to/file.xsd is a required argument')
         sys.exit(12)
 
 if COMMAND == 'setup_db':
     try:
         admin.setup_db(DATABASE, TABLE, HOME)
     except Exception as err:
-        print err
-        print 'ERROR: DB creation error.  Database tables already exist'
-        print 'Delete tables or database to reinitialize'
+        print(err)
+        print('ERROR: DB creation error.  Database tables already exist')
+        print('Delete tables or database to reinitialize')
 elif COMMAND == 'load_records':
     admin.load_records(CONTEXT, DATABASE, TABLE, XML_DIRPATH, RECURSIVE, FORCE_CONFIRM)
 elif COMMAND == 'export_records':
@@ -267,16 +273,16 @@ elif COMMAND == 'refresh_harvested_records':
 elif COMMAND == 'gen_sitemap':
     admin.gen_sitemap(CONTEXT, DATABASE, TABLE, URL, OUTPUT_FILE)
 elif COMMAND == 'post_xml':
-    print admin.post_xml(CSW_URL, XML, TIMEOUT)
+    print(admin.post_xml(CSW_URL, XML, TIMEOUT))
 elif COMMAND == 'get_sysprof':
-    print admin.get_sysprof()
+    print(admin.get_sysprof())
 elif COMMAND == 'validate_xml':
     admin.validate_xml(XML, XSD)
 elif COMMAND == 'delete_records':
     if not FORCE_CONFIRM:
-        if raw_input('This will delete all records! Continue? [Y/n] ') == 'Y':
+        if input('This will delete all records! Continue? [Y/n] ') == 'Y':
             FORCE_CONFIRM = True
     if FORCE_CONFIRM:
         admin.delete_records(CONTEXT, DATABASE, TABLE)
 
-print 'Done'
+print('Done')
diff --git a/bin/pycsw-pylint.sh b/bin/pycsw-pylint.sh
index 43e262c..b15f50e 100755
--- a/bin/pycsw-pylint.sh
+++ b/bin/pycsw-pylint.sh
@@ -3,7 +3,7 @@
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2011 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
diff --git a/csw.py b/csw.py
index 79fb7a7..ca48728 100755
--- a/csw.py
+++ b/csw.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python -u
-# -*- coding: iso-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2010 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -29,56 +29,14 @@
 #
 # =================================================================
 
-# CGI wrapper for pycsw
+"""
+A CGI wrapper for pycsw that reuses code from the wsgi wrapper.
+"""
 
-import os
-import sys
-from StringIO import StringIO
-from pycsw import server
+from wsgiref.handlers import CGIHandler
 
-CONFIG = 'default.cfg'
-GZIP = False
+from pycsw.wsgi import application
 
-if 'PYCSW_CONFIG' in os.environ:
-    CONFIG = os.environ['PYCSW_CONFIG']
-if os.environ['QUERY_STRING'].lower().find('config') != -1:
-    for kvp in os.environ['QUERY_STRING'].split('&'):
-        if kvp.lower().find('config') != -1:
-            CONFIG = kvp.split('=')[1]
 
-if ('HTTP_ACCEPT_ENCODING' in os.environ and
-        os.environ['HTTP_ACCEPT_ENCODING'].find('gzip') != -1):
-    # set for gzip compressed response
-    GZIP = True
-
-# get runtime configuration
-CSW = server.Csw(CONFIG)
-
-# set compression level
-if CSW.config.has_option('server', 'gzip_compresslevel'):
-    GZIP_COMPRESSLEVEL = \
-        int(CSW.config.get('server', 'gzip_compresslevel'))
-else:
-    GZIP_COMPRESSLEVEL = 0
-
-# go!
-OUTP = CSW.dispatch_cgi()
-
-sys.stdout.write("Content-Type:%s\r\n" % CSW.contenttype)
-
-if GZIP and GZIP_COMPRESSLEVEL > 0:
-    import gzip
-
-    BUF = StringIO()
-    GZIPFILE = gzip.GzipFile(mode='wb', fileobj=BUF,
-                             compresslevel=GZIP_COMPRESSLEVEL)
-    GZIPFILE.write(OUTP)
-    GZIPFILE.close()
-
-    OUTP = BUF.getvalue()
-
-    sys.stdout.write('Content-Encoding: gzip\r\n')
-
-sys.stdout.write('Content-Length: %d\r\n' % len(OUTP))
-sys.stdout.write('\r\n')
-sys.stdout.write(OUTP)
+handler = CGIHandler()
+handler.run(application)
diff --git a/default-sample.cfg b/default-sample.cfg
index 5420a7f..b8ed08f 100644
--- a/default-sample.cfg
+++ b/default-sample.cfg
@@ -2,7 +2,7 @@
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2010 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -37,7 +37,7 @@ maxrecords=10
 #loglevel=DEBUG
 #logfile=/tmp/pycsw.log
 #ogc_schemas_base=http://foo
-#federatedcatalogues=http://geo.data.gov/geoportal/csw/discovery
+#federatedcatalogues=http://catalog.data.gov/csw
 #pretty_print=true
 #gzip_compresslevel=8
 #domainquerytype=range
@@ -76,7 +76,7 @@ contact_role=pointOfContact
 
 [repository]
 # sqlite
-database=sqlite:////var/www/pycsw/tests/suites/cite/data/records.db
+database=sqlite:////var/www/pycsw/tests/suites/cite/data/cite.db
 # postgres
 #database=postgresql://username:password@localhost/pycsw
 # mysql
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 631e4ee..8ede7b4 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -34,7 +34,7 @@
 {% block footer %}
 
 <div class="footer">
-    <p>© Copyright {{ copyright }}. Last updated on {{ last_updated }}</p>
+    <p>© Copyright {{ copyright }}<br/>Last updated on {{ last_updated }}</p>
     <p>
         <a href="http://pycsw.org">Website</a> —
         <a href="http://pycsw.org/community">Community</a> —
diff --git a/docs/administration.rst b/docs/administration.rst
index e7a5068..a5e0dc4 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -74,7 +74,7 @@ Loading Records
 
   $ pycsw-admin.py -c load_records -f default.cfg -p /path/to/records
 
-This will import all ``*.xml`` records from ``/path/to/records`` into the database specified in ``default.cfg`` (``repository.database``).  Passing ``-r`` to the script will process ``/path/to/records`` recursively.  Passing ``-y`` to the script will force overwrite existing metadata with the same identifier.
+This will import all ``*.xml`` records from ``/path/to/records`` into the database specified in ``default.cfg`` (``repository.database``).  Passing ``-r`` to the script will process ``/path/to/records`` recursively.  Passing ``-y`` to the script will force overwrite existing metadata with the same identifier.  Note that ``-p`` accepts either a directory path or single file.
 
 .. note::
   Records can also be imported using CSW-T (see :ref:`transactions`).
diff --git a/docs/conf.py b/docs/conf.py
index 0b46ad3..2444d54 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,32 @@
 # -*- coding: utf-8 -*-
+# =================================================================
+#
+# Authors: Tom Kralidis <tomkralidis at gmail.com>
+#
+# Copyright (c) 2015 Tom Kralidis
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# =================================================================
 #
 # pycsw documentation build configuration file, created by
 # sphinx-quickstart on Fri Aug  2 19:48:50 2013.
@@ -42,14 +70,16 @@ master_doc = 'index'
 # General information about the project.
 project = u'pycsw'
 authors = u'Tom Kralidis'
-copyright = u'2010-2015, ' + authors
+license = u'This work is licensed under a Creative Commons Attribution 4.0 International License'
+copyright = u'2010-2015, ' + authors + ' ' + license
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = open('../VERSION.txt').read().strip()
+with open('../VERSION.txt') as f:
+    version = f.read().strip()
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/docs/hhypermap.rst b/docs/hhypermap.rst
new file mode 100644
index 0000000..5b3d889
--- /dev/null
+++ b/docs/hhypermap.rst
@@ -0,0 +1,17 @@
+.. _hhypermap:
+
+HHypermap Configuration
+=======================
+
+HHypermap (Harvard Hypermap) Supervisor (https://github.com/cga-harvard/HHypermap) is an application that manages OWS, Esri REST, and other types of map service harvesting, and maintains uptime statistics for services and layers. HHypermap Supervisor will publish to HHypermap Search (based on Lucene) which provides a fast search and visualization environment for spatio-temporal materials. 
+
+HHypermap uses CSW as a cataloguing mechanism to ingest, query and present geospatial metadata.
+
+pycsw supports binding to an existing HHypermap repository for metadata query.
+
+HHypermap Setup
+---------------
+
+pycsw is enabled and configured by default in HHypermap, so there are no additional steps required once HHypermap is setup.  See the ``PYCSW`` `settings/default.py entries`_ for customizing pycsw within HHypermap.
+
+.. _`settings/default.py entries`: https://github.com/cga-harvard/HHypermap/blob/master/hypermap/settings/default.py#L197
diff --git a/docs/index.rst b/docs/index.rst
index 868fa6d..6407d22 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,7 @@ pycsw |release| Documentation
    sru
    opensearch
    oaipmh
+   json
    soap
    sitemaps
    transactions
@@ -27,6 +28,7 @@ pycsw |release| Documentation
    profiles
    outputschemas
    geonode
+   hhypermap
    odc
    ckan
    testing
diff --git a/docs/installation.rst b/docs/installation.rst
index 9e0f1b9..3128224 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -45,7 +45,7 @@ The 4 minute install:
   # - server.home
   # - repository.database
   # set server.url to http://localhost:8000/
-  $ python csw.wsgi
+  $ python pycsw/wsgi.py
   $ curl http://localhost:8000/?service=CSW&version=2.0.2&request=GetCapabilities
 
 
@@ -80,7 +80,9 @@ The Clean and Proper Way
   $ python setup.py build
   $ python setup.py install
 
-At this point, pycsw is installed as a library and requires a CGI ``csw.py`` or WSGI ``csw.wsgi`` script to be served into your web server environment (see below for WSGI configuration/deployment).
+At this point, pycsw is installed as a library and requires a CGI ``csw.py``
+or WSGI ``pycsw/wsgi.py`` script to be served into your web server environment
+(see below for WSGI configuration/deployment).
 
 .. _pypi:
 
@@ -165,23 +167,33 @@ By default, ``default.cfg`` is at the root of the pycsw install.  If pycsw is se
 Running on WSGI
 ---------------
 
-pycsw supports the `Web Server Gateway Interface`_ (WSGI).  To run pycsw in WSGI mode, use ``csw.wsgi`` in your WSGI server environment.  Below is an example of configuring with Apache:
+pycsw supports the `Web Server Gateway Interface`_ (WSGI).  To run pycsw in
+WSGI mode, use ``pycsw/wsgi.py`` in your WSGI server environment.
+
+.. note::
+
+  ``mod_wsgi`` supports only the version of python it was compiled with. If the target server
+  already supports WSGI applications, pycsw will need to use the same python version.
+  `WSGIDaemonProcess`_ provides a ``python-path`` directive that may allow a virtualenv created from the python version ``mod_wsgi`` uses.
+
+Below is an example of configuring with Apache:
 
 .. code-block:: none
 
   WSGIDaemonProcess host1 home=/var/www/pycsw processes=2
   WSGIProcessGroup host1
-  WSGIScriptAlias /pycsw-wsgi /var/www/pycsw/csw.wsgi
+  WSGIScriptAlias /pycsw-wsgi /var/www/pycsw/wsgi.py
   <Directory /var/www/pycsw>
     Order deny,allow
     Allow from all
   </Directory>
 
+
 or use the `WSGI reference implementation`_:
 
 .. code-block:: bash
 
-  $ python ./csw.wsgi
+  $ python ./pycsw/wsgi.py
   Serving on port 8000...
 
 which will publish pycsw to ``http://localhost:8000/``
@@ -194,4 +206,5 @@ which will publish pycsw to ``http://localhost:8000/``
 .. _`easy_install`: http://packages.python.org/distribute/easy_install.html
 .. _`pip`: http://www.pip-installer.org
 .. _`Web Server Gateway Interface`: http://en.wikipedia.org/wiki/Web_Server_Gateway_Interface
+.. _`WSGIDaemonProcess`: https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIDaemonProcess
 .. _`WSGI reference implementation`: http://docs.python.org/library/wsgiref.html
diff --git a/docs/introduction.rst b/docs/introduction.rst
index 22cf968..b3681c8 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -17,12 +17,13 @@ Features
 - implements Full Text Search capabilities
 - implements OGC OpenSearch Geo and Time Extensions
 - implements Open Archives Initiative Protocol for Metadata Harvesting
-- supports ISO, Dublin Core, DIF, FGDC and Atom metadata models
+- supports ISO, Dublin Core, DIF, FGDC, Atom and GM03 metadata models
 - CGI or WSGI deployment
 - simple configuration
 - transactional capabilities (CSW-T)
 - flexible repository configuration
 - `GeoNode`_ connectivity
+- `HHypermap`_ connectivity
 - `Open Data Catalog`_ connectivity
 - `CKAN`_ connectivity
 - federated catalogue distributed searching
@@ -59,6 +60,8 @@ Standards Support
 +-------------------+------------+
 | `FGDC CSDGM`_     | 1998       | 
 +-------------------+------------+
+| `GM03`_           | 2.1        |
++-------------------+------------+
 | `SRU`_            | 1.1        | 
 +-------------------+------------+
 | `OGC OpenSearch`_ | 1.0        | 
@@ -103,6 +106,7 @@ Supported Output Schemas
 - FGDC CSDGM
 - NASA DIF
 - Atom
+- GM03
 
 Supported Sorting Functionality
 -------------------------------
@@ -188,7 +192,9 @@ Functions
 .. _`SRU`: http://www.loc.gov/standards/sru/
 .. _`OGC OpenSearch`: http://www.opengeospatial.org/standards/opensearchgeo
 .. _`GeoNode`: http://geonode.org/
+.. _`HHypermap`: https://github.com/cga-harvard/HHypermap
 .. _`Open Data Catalog`: https://github.com/azavea/Open-Data-Catalog/
 .. _`CKAN`: http://ckan.org/
 .. _`Compliant`: http://www.opengeospatial.org/resource/products/details/?pid=1325
 .. _`OAI-PMH`: http://www.openarchives.org/OAI/openarchivesprotocol.html
+.. _`GM03`: http://www.geocat.ch/internet/geocat/en/home/documentation/gm03.html
diff --git a/docs/json.rst b/docs/json.rst
new file mode 100644
index 0000000..a0e219b
--- /dev/null
+++ b/docs/json.rst
@@ -0,0 +1,7 @@
+.. _json:
+
+JSON Support
+============
+
+pycsw supports JSON support for ``DescribeRecord``, ``GetRecords`` and ``GetRecordById`` requests.  Adding ``outputFormat=application/json`` to your CSW request will return the response as a JSON representation.
+
diff --git a/docs/license.rst b/docs/license.rst
index eeb2337..1116f21 100644
--- a/docs/license.rst
+++ b/docs/license.rst
@@ -4,3 +4,10 @@ License
 =======
 
 .. include:: ../LICENSE.txt
+
+Documentation
+-------------
+
+The documentation is released under the `Creative Commons Attribution 4.0 International (CC BY 4.0)`_ license.
+
+.. _`Creative Commons Attribution 4.0 International (CC BY 4.0)`: http://creativecommons.org/licenses/by/4.0/
diff --git a/docs/outputschemas.rst b/docs/outputschemas.rst
index f364547..8e2fc9e 100644
--- a/docs/outputschemas.rst
+++ b/docs/outputschemas.rst
@@ -6,7 +6,7 @@ Output Schema Plugins
 Overview
 --------
 
-pycsw allows for extending the implementation of output schemas to the core standard.  outputschemas allow for a client to request metadata in a specific format (ISO, Dublin Core, FGDC, NASA DIF and Atom are default).
+pycsw allows for extending the implementation of output schemas to the core standard.  outputschemas allow for a client to request metadata in a specific format (ISO, Dublin Core, FGDC, NASA DIF Atom and GM03 are default).
 
 All outputschemas must be placed in the ``pycsw/plugins/outputschemas`` directory.
 
@@ -23,6 +23,7 @@ Requirements
        atom.py # default
        dif.py # default
        fgdc.py # default
+       gm03.py # default
 
 Implementing a new outputschema
 -------------------------------
diff --git a/docs/testing.rst b/docs/testing.rst
index c5c90d3..8729e8a 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -31,6 +31,8 @@ The tests framework can be run from ``tests`` using `Paver`_ (see ``pavement.py`
   $ paver test -s apiso,fgdc
   # run all tests, including harvesting (this is turned off by default given the volatility of remote services/data testing)
   $ paver test -r
+  # run all tests with 1000ms time benchmark
+  $ paver test -t 1000
 
 The tests perform HTTP GET and POST requests against ``http://localhost:8000``.  The expected output for each test can be found in ``expected``.  Results are categorized as ``passed``, ``failed``, or ``initialized``.  A summary of results is output at the end of the run.
 
diff --git a/docs/tools.rst b/docs/tools.rst
index c07ba1b..affb4e7 100644
--- a/docs/tools.rst
+++ b/docs/tools.rst
@@ -8,7 +8,7 @@ CSW Clients
 
 - `Geoportal CSW Clients <http://sourceforge.net/apps/mediawiki/geoportal/index.php?title=Geoportal_CSW_Clients>`_
 - `OWSLib <http://geopython.github.io/OWSLib>`_
-- `MetaSearch <http://geopython.github.io/MetaSearch>`_ (`QGIS <http://qgis.org/>`_ plugin)
+- `MetaSearch <https://hub.qgis.org/wiki/quantum-gis/MetaSearch>`_ (`QGIS <http://qgis.org/>`_ plugin)
 
 CSW Servers
 -----------
@@ -24,3 +24,4 @@ Metadata Editing Tools
 - `EUOSME <https://joinup.ec.europa.eu/software/euosme/description>`_
 - `GIMED <http://sourceforge.net/projects/gimed/>`_
 - `Metatools <http://hub.qgis.org/projects/metatools>`_ (`QGIS <http://qgis.org/>`_ plugin)
+- `QSphere <http://hub.qgis.org/plugins/qsphere>`_ (`QGIS <http://qgis.org/>`_ plugin)
diff --git a/docs/transactions.rst b/docs/transactions.rst
index ebc1bf0..1eb47da 100644
--- a/docs/transactions.rst
+++ b/docs/transactions.rst
@@ -15,10 +15,12 @@ For transactions and harvesting, pycsw supports the following metadata resource
 
   Dublin Core,``http://www.opengis.net/cat/csw/2.0.2``,yes,yes
   FGDC,``http://www.opengis.net/cat/csw/csdgm``,yes,yes
+  GM03,``http://www.interlis.ch/INTERLIS2.3``,yes,yes
   ISO 19139,``http://www.isotc211.org/2005/gmd``,yes,yes
   ISO GMI,``http://www.isotc211.org/2005/gmi``,yes,yes
   OGC:CSW 2.0.2,``http://www.opengis.net/cat/csw/2.0.2``,,yes
   OGC:WMS 1.1.1,``http://www.opengis.net/wms``,,yes
+  OGC:WMTS 1.0.0,``http://www.opengis.net/wmts/1.0``,,yes
   OGC:WFS 1.1.0,``http://www.opengis.net/wfs``,,yes
   OGC:WCS 1.0.0,``http://www.opengis.net/wcs``,,yes
   OGC:WPS 1.0.0,``http://www.opengis.net/wps/1.0.0``,,yes
diff --git a/etc/dist/opensuse/python-pycsw.spec b/etc/dist/opensuse/python-pycsw.spec
index 6056103..50fada2 100644
--- a/etc/dist/opensuse/python-pycsw.spec
+++ b/etc/dist/opensuse/python-pycsw.spec
@@ -1,7 +1,8 @@
+# =================================================================
 #
-# spec file for package python-pycsw (1.6.0)
+# Authors: Angelos Tzotsos <tzotsos at opensuse.org>
 #
-# Copyright (c) 2013 Angelos Tzotsos <tzotsos at opensuse.org>
+# Copyright (c) 2015 Angelos Tzotsos
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -23,7 +24,8 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-
+#
+# =================================================================
 
 %define _webappconfdir /etc/apache2/conf.d/
 %define _htdocsdir /srv/www/htdocs/
@@ -87,7 +89,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d
 #mv data %{buildroot}/srv/www/htdocs/pycsw/
 mv tests %{buildroot}/srv/www/htdocs/pycsw/
 mv csw.py %{buildroot}/srv/www/htdocs/pycsw/
-mv csw.wsgi %{buildroot}/srv/www/htdocs/pycsw/
+mv pycsw/wsgi.py %{buildroot}/srv/www/htdocs/pycsw/
 mv COMMITTERS.txt %{buildroot}/srv/www/htdocs/pycsw/
 mv default-sample.cfg %{buildroot}/srv/www/htdocs/pycsw/
 mv HISTORY.txt %{buildroot}/srv/www/htdocs/pycsw/
@@ -152,7 +154,7 @@ contact_role=pointOfContact
 
 [repository]
 # sqlite
-database=sqlite:////srv/www/htdocs/pycsw/tests/suites/cite/data/records.db
+database=sqlite:////srv/www/htdocs/pycsw/tests/suites/cite/data/cite.db
 # postgres
 #database=postgresql://username:password@localhost/pycsw
 # mysql
diff --git a/etc/mappings.py b/etc/mappings.py
index acf8826..cfb2a4d 100644
--- a/etc/mappings.py
+++ b/etc/mappings.py
@@ -1,9 +1,9 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2012 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
diff --git a/pavement.py b/pavement.py
index 34e530b..1e10692 100644
--- a/pavement.py
+++ b/pavement.py
@@ -1,9 +1,9 @@
-# -*- coding: iso-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2012 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -28,13 +28,17 @@
 #
 # =================================================================
 
-from ConfigParser import SafeConfigParser
+from __future__ import (absolute_import, division, print_function)
+
 import glob
 import os
 import sys
 import time
+
+from six.moves import configparser
+
 from paver.easy import task, cmdopts, needs, \
-    pushd, sh, call_task, path, info
+    pushd, sh, call_task, path, info, BuildFailure
 
 DOCS = 'docs'
 STAGE_DIR = '/tmp'
@@ -74,9 +78,9 @@ def publish_docs(options):
         # change privs to be group writeable
         for root, dirs, files in os.walk(local_path):
             for dfile in files:
-                os.chmod(os.path.join(root, dfile), 0664)
+                os.chmod(os.path.join(root, dfile), 0o664)
             for ddir in dirs:
-                os.chmod(os.path.join(root, ddir), 0775)
+                os.chmod(os.path.join(root, ddir), 0o775)
 
         # copy documentation
         sh('scp -r %s%s* %s@%s:%s' % (local_path, os.sep, user, remote_host,
@@ -88,7 +92,7 @@ def gen_tests_html():
     """Generate tests/index.html for online testing"""
     with pushd('tests'):
         # ensure manager testsuite is writeable
-        os.chmod(os.path.join('suites', 'manager', 'data'), 0777)
+        os.chmod(os.path.join('suites', 'manager', 'data'), 0o777)
         sh('python gen_html.py > index.html')
 
 
@@ -154,13 +158,12 @@ def setup_testdata():
         'manager': False
     }
 
-    # remove CITE database so we can build fresh
     for suite in test_database_parameters.keys():
         dbfile = 'tests/suites/%s/data/records.db' % suite
         if os.path.isfile(dbfile):
             os.remove(dbfile)
 
-    for database, has_testdata in test_database_parameters.iteritems():
+    for database, has_testdata in test_database_parameters.items():
         info('Setting up test database %s' % database)
         cfg = path('tests/suites/%s/default.cfg' % database)
         sh('pycsw-admin.py -c setup_db -f %s' % cfg)
@@ -178,6 +181,7 @@ def setup_testdata():
     ('user=', 'U', 'database username'),
     ('pass=', 'p', 'database password'),
     ('remote', 'r', 'remote testing (harvesting)'),
+    ('time=', 't', 'time (milliseconds) in which requests should complete')
 ])
 def test(options):
     """Run unit tests"""
@@ -185,11 +189,13 @@ def test(options):
     db_setup = False
     db_conn = None
     cfg_files = []
+    status = 0
 
     url = options.get('url', None)
     suites = options.get('suites', None)
     database = options.get('database', 'SQLite3')
     remote = options.get('remote')
+    timems = options.get('time', None)
 
     if url is None:
         # run against default server
@@ -208,6 +214,9 @@ def test(options):
     if remote:
         cmd = '%s -r' % cmd
 
+    if timems:
+        cmd = '%s -t %s' % (cmd, timems)
+
     # configure/setup database if not default
     if database != 'SQLite3':
         db_setup = True
@@ -249,7 +258,7 @@ def test(options):
                 elif suite == 'apiso':
                     tablename = 'records_apiso'
 
-                config = SafeConfigParser()
+                config = configparser.SafeConfigParser()
                 with open(cfg) as read_data:
                     config.readfp(read_data)
                 config.set('repository', 'database', db_conn)
@@ -269,7 +278,12 @@ def test(options):
             raise Exception('Invalid database specified')
 
     with pushd('tests'):
-        sh(cmd)
+        try:
+            sh(cmd)
+        except BuildFailure as err:
+            status = 1
+        # stop pycsw instance
+        call_task('stop')
 
     if db_setup:  # tearDown
         for cfg in cfg_files:
@@ -279,11 +293,13 @@ def test(options):
             sh('dropdb %s -U %s' % (temp_db, user))
             sh('unset PGPASSWORD')
 
+    sys.exit(status)
+
 
 @task
 def start(options):
     """Start local WSGI server instance"""
-    sh('python csw.wsgi 8000 &')
+    sh('python pycsw/wsgi.py 8000 &')
     time.sleep(10)
 
 
@@ -291,7 +307,7 @@ def start(options):
 def stop():
     """Stop local WSGI server instance"""
 
-    kill_process('python', 'csw.wsgi')
+    kill_process('python', 'pycsw/wsgi.py')
 
 
 @task
@@ -300,7 +316,6 @@ def stop():
 ])
 def reset(options):
     """Return codebase to pristine state"""
-    sh('git checkout tests/suites/cite/data/records.db')
 
     force = options.get('force')
     if force:
@@ -315,7 +330,7 @@ def kill_process(procname, scriptname):
     p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
     out, err = p.communicate()
 
-    for line in out.splitlines():
+    for line in out.decode().splitlines():
         if procname in line and scriptname in line:
             pid = int(line.split()[1])
             info('Stopping %s %s %d' % (procname, scriptname, pid))
diff --git a/pycsw/__init__.py b/pycsw/__init__.py
index d0b66b7..f880e71 100644
--- a/pycsw/__init__.py
+++ b/pycsw/__init__.py
@@ -1,9 +1,9 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2010 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -28,4 +28,4 @@
 #
 # =================================================================
 
-__version__ = '1.10.4'
+__version__ = '2.0.0-alpha1'
diff --git a/pycsw/config.py b/pycsw/config.py
deleted file mode 100644
index 0300b6c..0000000
--- a/pycsw/config.py
+++ /dev/null
@@ -1,339 +0,0 @@
-# -*- coding: iso-8859-15 -*-
-# =================================================================
-#
-# Authors: Tom Kralidis <tomkralidis at gmail.com>
-#
-# Copyright (c) 2011 Tom Kralidis
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# =================================================================
-
-import logging
-from lxml import etree
-from pycsw import __version__
-
-LOGGER = logging.getLogger(__name__)
-
-
-class StaticContext(object):
-    """core configuration"""
-    def __init__(self):
-        """initializer"""
-
-        LOGGER.debug('Initializing static context')
-        self.version = __version__
-
-        self.ogc_schemas_base = 'http://schemas.opengis.net'
-
-        self.parser = etree.XMLParser(resolve_entities=False)
-
-        self.languages = {
-            'en': 'english',
-            'fr': 'french',
-            'el': 'greek',
-        }
-
-        self.namespaces = {
-            'atom': 'http://www.w3.org/2005/Atom',
-            'csw': 'http://www.opengis.net/cat/csw/2.0.2',
-            'dc': 'http://purl.org/dc/elements/1.1/',
-            'dct': 'http://purl.org/dc/terms/',
-            'dif': 'http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/',
-            'fgdc': 'http://www.opengis.net/cat/csw/csdgm',
-            'gmd': 'http://www.isotc211.org/2005/gmd',
-            'gml': 'http://www.opengis.net/gml',
-            'ogc': 'http://www.opengis.net/ogc',
-            'os': 'http://a9.com/-/spec/opensearch/1.1/',
-            'ows': 'http://www.opengis.net/ows',
-            'rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-            'sitemap': 'http://www.sitemaps.org/schemas/sitemap/0.9',
-            'soapenv': 'http://www.w3.org/2003/05/soap-envelope',
-            'xlink': 'http://www.w3.org/1999/xlink',
-            'xs': 'http://www.w3.org/2001/XMLSchema',
-            'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
-        }
-
-        self.md_core_model = {
-            'typename': 'pycsw:CoreMetadata',
-            'outputschema': 'http://pycsw.org/metadata',
-            'mappings': {
-                'pycsw:Identifier': 'identifier',
-                # CSW typename (e.g. csw:Record, md:MD_Metadata)
-                'pycsw:Typename': 'typename',
-                # schema namespace, i.e. http://www.isotc211.org/2005/gmd
-                'pycsw:Schema': 'schema',
-                # origin of resource, either 'local', or URL to web service
-                'pycsw:MdSource': 'mdsource',
-                # date of insertion
-                'pycsw:InsertDate': 'insert_date',  # date of insertion
-                # raw XML metadata
-                'pycsw:XML': 'xml',
-                # bag of metadata element and attributes ONLY, no XML tages
-                'pycsw:AnyText': 'anytext',
-                'pycsw:Language': 'language',
-                'pycsw:Title': 'title',
-                'pycsw:Abstract': 'abstract',
-                'pycsw:Keywords': 'keywords',
-                'pycsw:KeywordType': 'keywordstype',
-                'pycsw:Format': 'format',
-                'pycsw:Source': 'source',
-                'pycsw:Date': 'date',
-                'pycsw:Modified': 'date_modified',
-                'pycsw:Type': 'type',
-                # geometry, specified in OGC WKT
-                'pycsw:BoundingBox': 'wkt_geometry',
-                'pycsw:CRS': 'crs',
-                'pycsw:AlternateTitle': 'title_alternate',
-                'pycsw:RevisionDate': 'date_revision',
-                'pycsw:CreationDate': 'date_creation',
-                'pycsw:PublicationDate': 'date_publication',
-                'pycsw:OrganizationName': 'organization',
-                'pycsw:SecurityConstraints': 'securityconstraints',
-                'pycsw:ParentIdentifier': 'parentidentifier',
-                'pycsw:TopicCategory': 'topicategory',
-                'pycsw:ResourceLanguage': 'resourcelanguage',
-                'pycsw:GeographicDescriptionCode': 'geodescode',
-                'pycsw:Denominator': 'denominator',
-                'pycsw:DistanceValue': 'distancevalue',
-                'pycsw:DistanceUOM': 'distanceuom',
-                'pycsw:TempExtent_begin': 'time_begin',
-                'pycsw:TempExtent_end': 'time_end',
-                'pycsw:ServiceType': 'servicetype',
-                'pycsw:ServiceTypeVersion': 'servicetypeversion',
-                'pycsw:Operation': 'operation',
-                'pycsw:CouplingType': 'couplingtype',
-                'pycsw:OperatesOn': 'operateson',
-                'pycsw:OperatesOnIdentifier': 'operatesonidentifier',
-                'pycsw:OperatesOnName': 'operatesoname',
-                'pycsw:Degree': 'degree',
-                'pycsw:AccessConstraints': 'accessconstraints',
-                'pycsw:OtherConstraints': 'otherconstraints',
-                'pycsw:Classification': 'classification',
-                'pycsw:ConditionApplyingToAccessAndUse': 'conditionapplyingtoaccessanduse',
-                'pycsw:Lineage': 'lineage',
-                'pycsw:ResponsiblePartyRole': 'responsiblepartyrole',
-                'pycsw:SpecificationTitle': 'specificationtitle',
-                'pycsw:SpecificationDate': 'specificationdate',
-                'pycsw:SpecificationDateType': 'specificationdatetype',
-                'pycsw:Creator': 'creator',
-                'pycsw:Publisher': 'publisher',
-                'pycsw:Contributor': 'contributor',
-                'pycsw:Relation': 'relation',
-                # links: format "name,description,protocol,url[^,,,[^,,,]]"
-                'pycsw:Links': 'links',
-            }
-        }
-
-        self.model = {
-            'operations': {
-                'GetCapabilities': {
-                    'methods': {
-                        'get': True,
-                        'post': True,
-                    },
-                    'parameters': {
-                        'sections': {
-                            'values': ['ServiceIdentification', 'ServiceProvider',
-                            'OperationsMetadata', 'Filter_Capabilities']
-                        }
-                    }
-                },
-                'DescribeRecord': {
-                    'methods': {
-                        'get': True,
-                        'post': True,
-                    },
-                    'parameters': {
-                        'schemaLanguage': {
-                            'values': ['http://www.w3.org/XML/Schema',
-                                       'http://www.w3.org/TR/xmlschema-1/',
-                                       'http://www.w3.org/2001/XMLSchema']
-                        },
-                        'typeName': {
-                            'values': ['csw:Record']
-                        },
-                        'outputFormat': {
-                            'values': ['application/xml', 'application/json']
-                        }
-                    }
-                },
-                'GetRecords': {
-                    'methods': {
-                        'get': True,
-                        'post': True,
-                    },
-                    'parameters': {
-                        'resultType': {
-                            'values': ['hits', 'results', 'validate']
-                        },
-                        'typeNames': {
-                            'values': ['csw:Record']
-                        },
-                        'outputSchema': {
-                            'values': ['http://www.opengis.net/cat/csw/2.0.2']
-                        },
-                        'outputFormat': {
-                            'values': ['application/xml', 'application/json']
-                        },
-                        'CONSTRAINTLANGUAGE': {
-                            'values': ['FILTER', 'CQL_TEXT']
-                        },
-                        'ElementSetName': {
-                            'values': ['brief', 'summary', 'full']
-                        }
-                    },
-                    'constraints': {
-                    }
-                },
-                'GetRecordById': {
-                    'methods': {
-                        'get': True,
-                        'post': True,
-                    },
-                    'parameters': {
-                        'outputSchema': {
-                            'values': ['http://www.opengis.net/cat/csw/2.0.2']
-                        },
-                        'outputFormat': {
-                            'values': ['application/xml', 'application/json']
-                        },
-                        'ElementSetName': {
-                            'values': ['brief', 'summary', 'full']
-                        }
-                    }
-                },
-                'GetRepositoryItem': {
-                    'methods': {
-                        'get': True,
-                        'post': False,
-                    },
-                    'parameters': {
-                    }
-                }
-            },
-            'parameters': {
-                'version': {
-                    'values': ['2.0.2']
-                },
-                'service': {
-                    'values': ['CSW']
-                }
-            },
-            'constraints': {
-                'MaxRecordDefault': {
-                    'values': ['10']
-                },
-                'PostEncoding': {
-                    'values': ['XML', 'SOAP']
-                },
-                'XPathQueryables': {
-                    'values': ['allowed']
-                }
-            },
-            'typenames': {
-                'csw:Record': {
-                    'outputschema': 'http://www.opengis.net/cat/csw/2.0.2',
-                    'queryables': {
-                        'SupportedDublinCoreQueryables': {
-                            # map Dublin Core queryables to core metadata model
-                            'dc:title':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Title']},
-                            'dc:creator':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Creator']},
-                            'dc:subject':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Keywords']},
-                            'dct:abstract':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Abstract']},
-                            'dc:publisher':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Publisher']},
-                            'dc:contributor':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Contributor']},
-                            'dct:modified':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Modified']},
-                            'dc:date':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Date']},
-                            'dc:type':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Type']},
-                            'dc:format':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Format']},
-                            'dc:identifier':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Identifier']},
-                            'dc:source':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Source']},
-                            'dc:language':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Language']},
-                            'dc:relation':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:Relation']},
-                            'dc:rights':
-                            {'dbcol':
-                             self.md_core_model['mappings']['pycsw:AccessConstraints']},
-                            # bbox and full text map to internal fixed columns
-                            'ows:BoundingBox':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:BoundingBox']},
-                            'csw:AnyText':
-                            {'dbcol': self.md_core_model['mappings']['pycsw:AnyText']},
-                        }
-                    }
-                }
-            }
-        }
-
-    def gen_domains(self):
-        """Generate parameter domain model"""
-        domain = {}
-        domain['methods'] = {'get': True, 'post': True}
-        domain['parameters'] = {'ParameterName': {'values': []}}
-        for operation in self.model['operations'].keys():
-            for parameter in self.model['operations'][operation]['parameters']:
-                domain['parameters']['ParameterName']['values'].append('%s.%s' %
-                                                        (operation, parameter))
-        return domain
-
-    def refresh_dc(self, mappings):
-        """Refresh Dublin Core mappings"""
-
-        LOGGER.debug('refreshing Dublin Core mappings with %s' % str(mappings))
-
-        defaults = {
-            'dc:title': 'pycsw:Title',
-            'dc:creator': 'pycsw:Creator',
-            'dc:subject': 'pycsw:Keywords',
-            'dct:abstract': 'pycsw:Abstract',
-            'dc:publisher': 'pycsw:Publisher',
-            'dc:contributor': 'pycsw:Contributor',
-            'dct:modified': 'pycsw:Modified',
-            'dc:date': 'pycsw:Date',
-            'dc:type': 'pycsw:Type',
-            'dc:format': 'pycsw:Format',
-            'dc:identifier': 'pycsw:Identifier',
-            'dc:source': 'pycsw:Source',
-            'dc:language': 'pycsw:Language',
-            'dc:relation': 'pycsw:Relation',
-            'dc:rights': 'pycsw:AccessConstraints',
-            'ows:BoundingBox': 'pycsw:BoundingBox',
-            'csw:AnyText': 'pycsw:AnyText',
-        }
-
-        for k, val in defaults.iteritems():
-            self.model['typenames']['csw:Record']['queryables']['SupportedDublinCoreQueryables'][k] = \
-                {'dbcol': mappings['mappings'][val]}
diff --git a/pycsw/plugins/profiles/__init__.py b/pycsw/core/__init__.py
similarity index 95%
copy from pycsw/plugins/profiles/__init__.py
copy to pycsw/core/__init__.py
index f98f82b..08a4c3d 100644
--- a/pycsw/plugins/profiles/__init__.py
+++ b/pycsw/core/__init__.py
@@ -1,9 +1,9 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2011 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
diff --git a/pycsw/admin.py b/pycsw/core/admin.py
similarity index 95%
rename from pycsw/admin.py
rename to pycsw/core/admin.py
index c3422cd..e4aecc7 100644
--- a/pycsw/admin.py
+++ b/pycsw/core/admin.py
@@ -1,11 +1,11 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #          Angelos Tzotsos <tzotsos at gmail.com>
 #
-# Copyright (c) 2012 Tom Kralidis
-# Copyright (c) 2014 Angelos Tzotsos
+# Copyright (c) 2015 Tom Kralidis
+# Copyright (c) 2015 Angelos Tzotsos
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -35,12 +35,13 @@ import os
 import sys
 from glob import glob
 
-from lxml import etree
-from pycsw import metadata, repository, util
+from pycsw.core import metadata, repository, util
+from pycsw.core.etree import etree
 
 LOGGER = logging.getLogger(__name__)
 
 
+
 def setup_db(database, table, home, create_sfsql_tables=True, create_plpythonu_functions=True, postgis_geometry_column='wkb_geometry', extra_columns=[], language='english'):
     """Setup database tables and indexes"""
     from sqlalchemy import Column, create_engine, Integer, MetaData, \
@@ -72,7 +73,7 @@ def setup_db(database, table, home, create_sfsql_tables=True, create_plpythonu_f
             LOGGER.info('PostGIS %s detected: Skipping SFSQL tables creation' % postgis_lib_version)
         except:
             pass
-    
+
     if create_sfsql_tables:
         LOGGER.info('Creating table spatial_ref_sys')
         srs = Table(
@@ -83,10 +84,10 @@ def setup_db(database, table, home, create_sfsql_tables=True, create_plpythonu_f
             Column('srtext', Text)
         )
         srs.create()
-    
+
         i = srs.insert()
         i.execute(srid=4326, auth_name='EPSG', auth_srid=4326, srtext='GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]')
-    
+
         LOGGER.info('Creating table geometry_columns')
         geom = Table(
             'geometry_columns', mdata,
@@ -100,7 +101,7 @@ def setup_db(database, table, home, create_sfsql_tables=True, create_plpythonu_f
             Column('geometry_format', Text, nullable=False),
         )
         geom.create()
-    
+
         i = geom.insert()
         i.execute(f_table_catalog='public', f_table_schema='public',
                   f_table_name=table, f_geometry_column='wkt_geometry',
@@ -258,7 +259,7 @@ def setup_db(database, table, home, create_sfsql_tables=True, create_plpythonu_f
             from pycsw import util
             return util.get_spatial_overlay_rank(target_geom, query_geom)
             $$ LANGUAGE plpythonu;
-        ''' % pycsw_home 
+        ''' % pycsw_home
             conn.execute(function_get_anytext)
             conn.execute(function_query_spatial)
             conn.execute(function_update_xpath)
@@ -267,13 +268,13 @@ def setup_db(database, table, home, create_sfsql_tables=True, create_plpythonu_f
 
     if dbase.name == 'postgresql':
         LOGGER.info('Creating PostgreSQL Free Text Search (FTS) GIN index')
-	tsvector_fts = "alter table %s add column anytext_tsvector tsvector" % table
-	conn.execute(tsvector_fts)
+        tsvector_fts = "alter table %s add column anytext_tsvector tsvector" % table
+        conn.execute(tsvector_fts)
         index_fts = "create index fts_gin_idx on %s using gin(anytext_tsvector)" % table
         conn.execute(index_fts)
-	# This needs to run if records exist "UPDATE records SET anytext_tsvector = to_tsvector('english', anytext)"
-	trigger_fts = "create trigger ftsupdate before insert or update on %s for each row execute procedure tsvector_update_trigger('anytext_tsvector', 'pg_catalog.%s', 'anytext')" % (table, language)
-	conn.execute(trigger_fts)
+        # This needs to run if records exist "UPDATE records SET anytext_tsvector = to_tsvector('english', anytext)"
+        trigger_fts = "create trigger ftsupdate before insert or update on %s for each row execute procedure tsvector_update_trigger('anytext_tsvector', 'pg_catalog.%s', 'anytext')" % (table, language)
+        conn.execute(trigger_fts)
 
     if dbase.name == 'postgresql' and create_postgis_geometry:
         # create native geometry column within db
@@ -312,7 +313,9 @@ def load_records(context, database, table, xml_dirpath, recursive=False, force_u
 
     file_list = []
 
-    if recursive:
+    if os.path.isfile(xml_dirpath):
+        file_list.append(xml_dirpath)
+    elif recursive:
         for root, dirs, files in os.walk(xml_dirpath):
             for mfile in files:
                 if mfile.endswith('.xml'):
@@ -495,7 +498,8 @@ def post_xml(url, xml, timeout=30):
 
     from owslib.util import http_post
     try:
-        return http_post(url=url, request=open(xml).read(), timeout=timeout)
+        with open(xml) as f:
+            return http_post(url=url, request=f.read(), timeout=timeout)
     except Exception as err:
         raise RuntimeError(err)
 
@@ -569,6 +573,6 @@ def delete_records(context, database, table):
     """Deletes all records from repository"""
 
     LOGGER.info('Deleting all records')
-    
+
     repo = repository.Repository(database, context, table=table)
     repo.delete(constraint={'where': '', 'values': []})
diff --git a/pycsw/core/config.py b/pycsw/core/config.py
new file mode 100644
index 0000000..5207a9a
--- /dev/null
+++ b/pycsw/core/config.py
@@ -0,0 +1,593 @@
+# -*- coding: utf-8 -*-
+# =================================================================
+#
+# Authors: Tom Kralidis <tomkralidis at gmail.com>
+#
+# Copyright (c) 2016 Tom Kralidis
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# =================================================================
+
+import logging
+from pycsw.core.etree import etree
+from pycsw import __version__
+
+LOGGER = logging.getLogger(__name__)
+
+
+class StaticContext(object):
+    """core configuration"""
+    def __init__(self, prefix='csw30'):
+        """initializer"""
+
+        LOGGER.debug('Initializing static context')
+        self.version = __version__
+
+        self.ogc_schemas_base = 'http://schemas.opengis.net'
+
+        self.parser = etree.XMLParser(resolve_entities=False)
+
+        self.languages = {
+            'en': 'english',
+            'fr': 'french',
+            'el': 'greek',
+        }
+
+        self.response_codes = {
+            'OK': '200 OK',
+            'NotFound': '404 Not Found',
+            'InvalidValue': '400 Invalid property value',
+            'OperationParsingFailed': '400 Bad Request',
+            'OperationProcessingFailed': '403 Server Processing Failed',
+            'OperationNotSupported': '400 Not Implemented',
+            'MissingParameterValue': '400 Bad Request',
+            'InvalidParameterValue': '400 Bad Request',
+            'VersionNegotiationFailed': '400 Bad Request',
+            'InvalidUpdateSequence': '400 Bad Request',
+            'OptionNotSupported': '400 Not Implemented',
+            'NoApplicableCode': '400 Internal Server Error'
+        }
+
+        self.namespaces = {
+            'atom': 'http://www.w3.org/2005/Atom',
+            'csw': 'http://www.opengis.net/cat/csw/2.0.2',
+            'csw30': 'http://www.opengis.net/cat/csw/3.0',
+            'dc': 'http://purl.org/dc/elements/1.1/',
+            'dct': 'http://purl.org/dc/terms/',
+            'dif': 'http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/',
+            'fes20': 'http://www.opengis.net/fes/2.0',
+            'fgdc': 'http://www.opengis.net/cat/csw/csdgm',
+            'gm03': 'http://www.interlis.ch/INTERLIS2.3',
+            'gmd': 'http://www.isotc211.org/2005/gmd',
+            'gml': 'http://www.opengis.net/gml',
+            'ogc': 'http://www.opengis.net/ogc',
+            'os': 'http://a9.com/-/spec/opensearch/1.1/',
+            'ows': 'http://www.opengis.net/ows',
+            'ows11': 'http://www.opengis.net/ows/1.1',
+            'ows20': 'http://www.opengis.net/ows/2.0',
+            'rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+            'sitemap': 'http://www.sitemaps.org/schemas/sitemap/0.9',
+            'soapenv': 'http://www.w3.org/2003/05/soap-envelope',
+            'xlink': 'http://www.w3.org/1999/xlink',
+            'xs': 'http://www.w3.org/2001/XMLSchema',
+            'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
+        }
+
+        self.keep_ns_prefixes = [
+            'csw', 'dc', 'dct', 'gmd', 'gml', 'ows', 'xs'
+        ]
+
+        self.md_core_model = {
+            'typename': 'pycsw:CoreMetadata',
+            'outputschema': 'http://pycsw.org/metadata',
+            'mappings': {
+                'pycsw:Identifier': 'identifier',
+                # CSW typename (e.g. csw:Record, md:MD_Metadata)
+                'pycsw:Typename': 'typename',
+                # schema namespace, i.e. http://www.isotc211.org/2005/gmd
+                'pycsw:Schema': 'schema',
+                # origin of resource, either 'local', or URL to web service
+                'pycsw:MdSource': 'mdsource',
+                # date of insertion
+                'pycsw:InsertDate': 'insert_date',  # date of insertion
+                # raw XML metadata
+                'pycsw:XML': 'xml',
+                # bag of metadata element and attributes ONLY, no XML tages
+                'pycsw:AnyText': 'anytext',
+                'pycsw:Language': 'language',
+                'pycsw:Title': 'title',
+                'pycsw:Abstract': 'abstract',
+                'pycsw:Keywords': 'keywords',
+                'pycsw:KeywordType': 'keywordstype',
+                'pycsw:Format': 'format',
+                'pycsw:Source': 'source',
+                'pycsw:Date': 'date',
+                'pycsw:Modified': 'date_modified',
+                'pycsw:Type': 'type',
+                # geometry, specified in OGC WKT
+                'pycsw:BoundingBox': 'wkt_geometry',
+                'pycsw:CRS': 'crs',
+                'pycsw:AlternateTitle': 'title_alternate',
+                'pycsw:RevisionDate': 'date_revision',
+                'pycsw:CreationDate': 'date_creation',
+                'pycsw:PublicationDate': 'date_publication',
+                'pycsw:OrganizationName': 'organization',
+                'pycsw:SecurityConstraints': 'securityconstraints',
+                'pycsw:ParentIdentifier': 'parentidentifier',
+                'pycsw:TopicCategory': 'topicategory',
+                'pycsw:ResourceLanguage': 'resourcelanguage',
+                'pycsw:GeographicDescriptionCode': 'geodescode',
+                'pycsw:Denominator': 'denominator',
+                'pycsw:DistanceValue': 'distancevalue',
+                'pycsw:DistanceUOM': 'distanceuom',
+                'pycsw:TempExtent_begin': 'time_begin',
+                'pycsw:TempExtent_end': 'time_end',
+                'pycsw:ServiceType': 'servicetype',
+                'pycsw:ServiceTypeVersion': 'servicetypeversion',
+                'pycsw:Operation': 'operation',
+                'pycsw:CouplingType': 'couplingtype',
+                'pycsw:OperatesOn': 'operateson',
+                'pycsw:OperatesOnIdentifier': 'operatesonidentifier',
+                'pycsw:OperatesOnName': 'operatesoname',
+                'pycsw:Degree': 'degree',
+                'pycsw:AccessConstraints': 'accessconstraints',
+                'pycsw:OtherConstraints': 'otherconstraints',
+                'pycsw:Classification': 'classification',
+                'pycsw:ConditionApplyingToAccessAndUse': 'conditionapplyingtoaccessanduse',
+                'pycsw:Lineage': 'lineage',
+                'pycsw:ResponsiblePartyRole': 'responsiblepartyrole',
+                'pycsw:SpecificationTitle': 'specificationtitle',
+                'pycsw:SpecificationDate': 'specificationdate',
+                'pycsw:SpecificationDateType': 'specificationdatetype',
+                'pycsw:Creator': 'creator',
+                'pycsw:Publisher': 'publisher',
+                'pycsw:Contributor': 'contributor',
+                'pycsw:Relation': 'relation',
+                # links: format "name,description,protocol,url[^,,,[^,,,]]"
+                'pycsw:Links': 'links',
+            }
+        }
+
+        self.model = None
+
+        self.models = {
+            'csw': {
+                'operations_order': [
+                    'GetCapabilities', 'DescribeRecord', 'GetDomain',
+                    'GetRecords', 'GetRecordById', 'GetRepositoryItem'
+                ],
+                'operations': {
+                    'GetCapabilities': {
+                        'methods': {
+                            'get': True,
+                            'post': True,
+                        },
+                        'parameters': {
+                            'sections': {
+                                'values': ['ServiceIdentification', 'ServiceProvider',
+                                'OperationsMetadata', 'Filter_Capabilities']
+                            }
+                        }
+                    },
+                    'DescribeRecord': {
+                        'methods': {
+                            'get': True,
+                            'post': True,
+                        },
+                        'parameters': {
+                            'schemaLanguage': {
+                                'values': ['http://www.w3.org/XML/Schema',
+                                           'http://www.w3.org/TR/xmlschema-1/',
+                                           'http://www.w3.org/2001/XMLSchema']
+                            },
+                            'typeName': {
+                                'values': ['csw:Record']
+                            },
+                            'outputFormat': {
+                                'values': ['application/xml', 'application/json']
+                            }
+                        }
+                    },
+                    'GetRecords': {
+                        'methods': {
+                            'get': True,
+                            'post': True,
+                        },
+                        'parameters': {
+                            'resultType': {
+                                'values': ['hits', 'results', 'validate']
+                            },
+                            'typeNames': {
+                                'values': ['csw:Record']
+                            },
+                            'outputSchema': {
+                                'values': ['http://www.opengis.net/cat/csw/2.0.2']
+                            },
+                            'outputFormat': {
+                                'values': ['application/xml', 'application/json']
+                            },
+                            'CONSTRAINTLANGUAGE': {
+                                'values': ['FILTER', 'CQL_TEXT']
+                            },
+                            'ElementSetName': {
+                                'values': ['brief', 'summary', 'full']
+                            }
+                        },
+                        'constraints': {
+                        }
+                    },
+                    'GetRecordById': {
+                        'methods': {
+                            'get': True,
+                            'post': True,
+                        },
+                        'parameters': {
+                            'outputSchema': {
+                                'values': ['http://www.opengis.net/cat/csw/2.0.2']
+                            },
+                            'outputFormat': {
+                                'values': ['application/xml', 'application/json']
+                            },
+                            'ElementSetName': {
+                                'values': ['brief', 'summary', 'full']
+                            }
+                        }
+                    },
+                    'GetRepositoryItem': {
+                        'methods': {
+                            'get': True,
+                            'post': False,
+                        },
+                        'parameters': {
+                        }
+                    }
+                },
+                'parameters': {
+                    'version': {
+                        'values': ['2.0.2', '3.0.0']
+                    },
+                    'service': {
+                        'values': ['CSW']
+                    }
+                },
+                'constraints': {
+                    'MaxRecordDefault': {
+                        'values': ['10']
+                    },
+                    'PostEncoding': {
+                        'values': ['XML', 'SOAP']
+                    },
+                    'XPathQueryables': {
+                        'values': ['allowed']
+                    }
+                },
+                'typenames': {
+                    'csw:Record': {
+                        'outputschema': 'http://www.opengis.net/cat/csw/2.0.2',
+                        'queryables': {
+                            'SupportedDublinCoreQueryables': {
+                                # map Dublin Core queryables to core metadata model
+                                'dc:title':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Title']},
+                                'dc:creator':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Creator']},
+                                'dc:subject':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Keywords']},
+                                'dct:abstract':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Abstract']},
+                                'dc:publisher':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Publisher']},
+                                'dc:contributor':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Contributor']},
+                                'dct:modified':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Modified']},
+                                'dc:date':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Date']},
+                                'dc:type':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Type']},
+                                'dc:format':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Format']},
+                                'dc:identifier':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Identifier']},
+                                'dc:source':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Source']},
+                                'dc:language':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Language']},
+                                'dc:relation':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Relation']},
+                                'dc:rights':
+                                {'dbcol':
+                                 self.md_core_model['mappings']['pycsw:AccessConstraints']},
+                                # bbox and full text map to internal fixed columns
+                                'ows:BoundingBox':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:BoundingBox']},
+                                'csw:AnyText':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:AnyText']},
+                            }
+                        }
+                    }
+                }
+            },
+            'csw30': {
+                'operations_order': [
+                    'GetCapabilities', 'GetDomain', 'GetRecords',
+                    'GetRecordById', 'GetRepositoryItem'
+                ],
+                'operations': {
+                    'GetCapabilities': {
+                        'methods': {
+                            'get': True,
+                            'post': True,
+                        },
+                        'parameters': {
+                            'acceptVersions': {
+                                'values': ['2.0.2', '3.0.0']
+                            },
+                            'acceptFormats': {
+                                'values': ['text/xml', 'application/xml']
+                            },
+                            'sections': {
+                                'values': ['ServiceIdentification', 'ServiceProvider',
+                                'OperationsMetadata', 'Filter_Capabilities', 'All']
+                            }
+                        }
+                    },
+                    'GetRecords': {
+                        'methods': {
+                            'get': True,
+                            'post': True,
+                        },
+                        'parameters': {
+                            'typeNames': {
+                                'values': ['csw:Record']
+                            },
+                            'outputSchema': {
+                                'values': ['http://www.opengis.net/cat/csw/3.0']
+                            },
+                            'outputFormat': {
+                                'values': ['application/xml', 'application/json', 'application/atom+xml']
+                            },
+                            'CONSTRAINTLANGUAGE': {
+                                'values': ['FILTER', 'CQL_TEXT']
+                            },
+                            'ElementSetName': {
+                                'values': ['brief', 'summary', 'full']
+                            }
+                        },
+                        'constraints': {
+                        }
+                    },
+                    'GetRecordById': {
+                        'methods': {
+                            'get': True,
+                            'post': True,
+                        },
+                        'parameters': {
+                            'outputSchema': {
+                                'values': ['http://www.opengis.net/cat/csw/3.0']
+                            },
+                            'outputFormat': {
+                                'values': ['application/xml', 'application/json', 'application/atom+xml']
+                            },
+                            'ElementSetName': {
+                                'values': ['brief', 'summary', 'full']
+                            }
+                        }
+                    },
+                    'GetRepositoryItem': {
+                        'methods': {
+                            'get': True,
+                            'post': False,
+                        },
+                        'parameters': {
+                        }
+                    }
+                },
+                'parameters': {
+                    'version': {
+                        'values': ['2.0.2', '3.0.0']
+                    },
+                    'service': {
+                        'values': ['CSW']
+                    }
+                },
+                'constraints': {
+                    'MaxRecordDefault': {
+                        'values': ['10']
+                    },
+                    'PostEncoding': {
+                        'values': ['XML', 'SOAP']
+                    },
+                    'XPathQueryables': {
+                        'values': ['allowed']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/OpenSearch': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetCapabilities-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetRecordById-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetRecords-Basic-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetRecords-Distributed-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetRecords-Distributed-KVP': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetRecords-Async-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetRecords-Async-KVP': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetDomain-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/GetDomain-KVP': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Transaction': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Harvest-Basic-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Harvest-Basic-KVP': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Harvest-Async-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Harvest-Async-KVP': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Harvest-Periodic-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Harvest-Periodic-KVP': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Filter-CQL': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Filter-FES-XML': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/Filter-FES-KVP-Advanced': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/SupportedGMLVersions': {
+                        'values': ['http://www.opengis.net/gml']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/DefaultSortingAlgorithm': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/CoreQueryables': {
+                        'values': ['TRUE']
+                    },
+                    'http://www.opengis.net/spec/csw/3.0/conf/CoreSortables': {
+                        'values': ['TRUE']
+                    }
+                },
+                'typenames': {
+                    'csw:Record': {
+                        'outputschema': 'http://www.opengis.net/cat/csw/3.0',
+                        'queryables': {
+                            'SupportedDublinCoreQueryables': {
+                                # map Dublin Core queryables to core metadata model
+                                'dc:title':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Title']},
+                                'dc:creator':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Creator']},
+                                'dc:subject':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Keywords']},
+                                'dct:abstract':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Abstract']},
+                                'dc:publisher':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Publisher']},
+                                'dc:contributor':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Contributor']},
+                                'dct:modified':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Modified']},
+                                'dc:date':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Date']},
+                                'dc:type':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Type']},
+                                'dc:format':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Format']},
+                                'dc:identifier':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Identifier']},
+                                'dc:source':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Source']},
+                                'dc:language':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Language']},
+                                'dc:relation':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:Relation']},
+                                'dc:rights':
+                                {'dbcol':
+                                 self.md_core_model['mappings']['pycsw:AccessConstraints']},
+                                # bbox and full text map to internal fixed columns
+                                'ows:BoundingBox':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:BoundingBox']},
+                                'csw:AnyText':
+                                {'dbcol': self.md_core_model['mappings']['pycsw:AnyText']},
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        self.set_model(prefix)
+
+    def set_model(self, prefix):
+        """sets model given request context"""
+
+        self.model = self.models[prefix]
+
+    def gen_domains(self):
+        """Generate parameter domain model"""
+        domain = {}
+        domain['methods'] = {'get': True, 'post': True}
+        domain['parameters'] = {'ParameterName': {'values': []}}
+        for operation in self.model['operations'].keys():
+            for parameter in self.model['operations'][operation]['parameters']:
+                domain['parameters']['ParameterName']['values'].append('%s.%s' %
+                                                        (operation, parameter))
+        return domain
+
+    def refresh_dc(self, mappings):
+        """Refresh Dublin Core mappings"""
+
+        LOGGER.debug('refreshing Dublin Core mappings with %s' % str(mappings))
+
+        defaults = {
+            'dc:title': 'pycsw:Title',
+            'dc:creator': 'pycsw:Creator',
+            'dc:subject': 'pycsw:Keywords',
+            'dct:abstract': 'pycsw:Abstract',
+            'dc:publisher': 'pycsw:Publisher',
+            'dc:contributor': 'pycsw:Contributor',
+            'dct:modified': 'pycsw:Modified',
+            'dc:date': 'pycsw:Date',
+            'dc:type': 'pycsw:Type',
+            'dc:format': 'pycsw:Format',
+            'dc:identifier': 'pycsw:Identifier',
+            'dc:source': 'pycsw:Source',
+            'dc:language': 'pycsw:Language',
+            'dc:relation': 'pycsw:Relation',
+            'dc:rights': 'pycsw:AccessConstraints',
+            'ows:BoundingBox': 'pycsw:BoundingBox',
+            'csw:AnyText': 'pycsw:AnyText',
+        }
+
+        for k, val in defaults.items():
+            for model, params in self.models.items():
+                queryables = params['typenames']['csw:Record']['queryables']
+                queryables['SupportedDublinCoreQueryables'][k] = {
+                    'dbcol': mappings['mappings'][val]
+                }
diff --git a/pycsw/plugins/profiles/__init__.py b/pycsw/core/etree.py
similarity index 93%
copy from pycsw/plugins/profiles/__init__.py
copy to pycsw/core/etree.py
index f98f82b..491a80b 100644
--- a/pycsw/plugins/profiles/__init__.py
+++ b/pycsw/core/etree.py
@@ -1,9 +1,9 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2011 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -27,3 +27,5 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 # =================================================================
+
+from lxml import etree
diff --git a/pycsw/plugins/profiles/__init__.py b/pycsw/core/formats/__init__.py
similarity index 95%
copy from pycsw/plugins/profiles/__init__.py
copy to pycsw/core/formats/__init__.py
index f98f82b..08a4c3d 100644
--- a/pycsw/plugins/profiles/__init__.py
+++ b/pycsw/core/formats/__init__.py
@@ -1,9 +1,9 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2011 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
diff --git a/pycsw/formats/fmt_json.py b/pycsw/core/formats/fmt_json.py
similarity index 75%
rename from pycsw/formats/fmt_json.py
rename to pycsw/core/formats/fmt_json.py
index 71e5ac5..ded6ac6 100644
--- a/pycsw/formats/fmt_json.py
+++ b/pycsw/core/formats/fmt_json.py
@@ -1,9 +1,9 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2012 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -29,11 +29,16 @@
 # =================================================================
 
 import json
-from pycsw.util import exml2dict
+from pycsw.core.util import xml2dict
 
 
-def exml2json(response, namespaces, pretty_print=False):
-    """Convert an lxml object to JSON"""
+def xml2json(xml_string, namespaces, pretty_print=False):
+    """Convert an xml string to JSON"""
+
+    separators = (',', ': ')
+
     if pretty_print:
-        return json.dumps(exml2dict(response, namespaces), indent=4)
-    return json.dumps(exml2dict(response, namespaces))
+        return json.dumps(xml2dict(xml_string, namespaces),
+                          indent=4, separators=separators)
+
+    return json.dumps(xml2dict(xml_string, namespaces), separators=separators)
diff --git a/pycsw/log.py b/pycsw/core/log.py
similarity index 98%
rename from pycsw/log.py
rename to pycsw/core/log.py
index fada401..2f32e6f 100644
--- a/pycsw/log.py
+++ b/pycsw/core/log.py
@@ -1,9 +1,9 @@
-# -*- coding: iso-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2011 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
diff --git a/pycsw/metadata.py b/pycsw/core/metadata.py
similarity index 80%
rename from pycsw/metadata.py
rename to pycsw/core/metadata.py
index 8153e6f..6c0d030 100644
--- a/pycsw/metadata.py
+++ b/pycsw/core/metadata.py
@@ -1,9 +1,10 @@
-# -*- coding: ISO-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2011 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
+# Copyright (c) 2016 James F. Dickens
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -30,11 +31,12 @@
 
 import logging
 import uuid
-from urlparse import urlparse
-from lxml import etree
+from six.moves import range
+from six.moves.urllib.parse import urlparse
 from owslib.util import build_get_url
-from pycsw import util
-from geolinks.links import sniff_link
+from geolinks import sniff_link
+from pycsw.core import util
+from pycsw.core.etree import etree
 
 LOGGER = logging.getLogger(__name__)
 
@@ -44,7 +46,7 @@ def parse_record(context, record, repos=None,
     ''' parse metadata '''
 
     if identifier is None:
-        identifier = uuid.uuid4().get_urn()
+        identifier = uuid.uuid4().urn
 
     # parse web services
     if (mtype == 'http://www.opengis.net/cat/csw/2.0.2' and
@@ -73,7 +75,11 @@ def parse_record(context, record, repos=None,
     elif mtype == 'http://www.opengis.net/wms':  # WMS
         LOGGER.debug('WMS detected, fetching via OWSLib')
         return _parse_wms(context, repos, record, identifier)
-     
+
+    elif mtype == 'http://www.opengis.net/wmts/1.0':  # WMTS
+        LOGGER.debug('WMTS 1.0.0 detected, fetching via OWSLib')
+        return _parse_wmts(context, repos, record, identifier)
+
     elif mtype == 'http://www.opengis.net/wps/1.0.0':  # WPS
         LOGGER.debug('WPS detected, fetching via OWSLib')
         return [_parse_wps(context, repos, record, identifier)]
@@ -127,6 +133,8 @@ def _parse_metadata(context, repos, record):
         return [_parse_iso(context, repos, exml)]
     elif root == 'metadata':  # FGDC
         return [_parse_fgdc(context, repos, exml)]
+    elif root == '{%s}TRANSFER' % context.namespaces['gm03']:  # GM03
+        return [_parse_gm03(context, repos, exml)]
     elif root == '{%s}Record' % context.namespaces['csw']:  # Dublin Core CSW
         return [_parse_dc(context, repos, exml)]
     elif root == '{%s}RDF' % context.namespaces['rdf']:  # Dublin Core RDF
@@ -219,11 +227,18 @@ def _parse_csw(context, repos, record, identifier, pagesize=10):
                            maxrecords=pagesize, outputschema=csw_outputschema, esn='full')
         except Exception as err:  # this is a CSW, but server rejects query
             raise RuntimeError(md.response)
-        for k, v in md.records.iteritems():
-            if csw_typenames == 'gmd:MD_Metadata':
-                recobjs.append(_parse_iso(context, repos, etree.fromstring(v.xml, context.parser)))
-            else:
-                recobjs.append(_parse_dc(context, repos, etree.fromstring(v.xml, context.parser)))
+        for k, v in md.records.items():
+            # try to parse metadata
+            try:
+                LOGGER.debug('Parsing metadata record: %s', v.xml)
+                if csw_typenames == 'gmd:MD_Metadata':
+                    recobjs.append(_parse_iso(context, repos,
+                                              etree.fromstring(v.xml, context.parser)))
+                else:
+                    recobjs.append(_parse_dc(context, repos,
+                                             etree.fromstring(v.xml, context.parser)))
+            except Exception as err:  # parsing failed for some reason
+                LOGGER.warning('Metadata parsing failed %s', err)
 
     return recobjs
 
@@ -237,10 +252,10 @@ def _parse_waf(context, repos, record, identifier):
 
     try:
         parser = etree.HTMLParser()
-        tree = etree.fromstring(content, parser=parser)
+        tree = etree.fromstring(content, parser)
     except Exception as err:
         raise Exception('Could not parse WAF: %s' % str(err))
-        
+
     up = urlparse(record)
     links = []
 
@@ -326,8 +341,8 @@ def _parse_wms(context, repos, record, identifier):
     _set(context, serviceobj, 'pycsw:Links', '^'.join(links))
     _set(context, serviceobj, 'pycsw:XML', caps2iso(serviceobj, md, context))
 
-    recobjs.append(serviceobj) 
-         
+    recobjs.append(serviceobj)
+
     # generate record foreach layer
 
     LOGGER.debug('Harvesting %d WMS layers' % len(md.contents))
@@ -404,6 +419,126 @@ def _parse_wms(context, repos, record, identifier):
 
     return recobjs
 
+def _parse_wmts(context, repos, record, identifier):
+
+    from owslib.wmts import WebMapTileService
+
+    recobjs = []
+    serviceobj = repos.dataset()
+
+    md = WebMapTileService(record)
+    # generate record of service instance
+    _set(context, serviceobj, 'pycsw:Identifier', identifier)
+    _set(context, serviceobj, 'pycsw:Typename', 'csw:Record')
+    _set(context, serviceobj, 'pycsw:Schema', 'http://www.opengis.net/wmts/1.0')
+    _set(context, serviceobj, 'pycsw:MdSource', record)
+    _set(context, serviceobj, 'pycsw:InsertDate', util.get_today_and_now())
+    _set(context, serviceobj, 'pycsw:AnyText', util.get_anytext(md.getServiceXML()))
+    _set(context, serviceobj, 'pycsw:Type', 'service')
+    _set(context, serviceobj, 'pycsw:Title', md.identification.title)
+    _set(context, serviceobj, 'pycsw:Abstract', md.identification.abstract)
+    _set(context, serviceobj, 'pycsw:Keywords', ','.join(md.identification.keywords))
+    _set(context, serviceobj, 'pycsw:Creator', md.provider.contact.name)
+    _set(context, serviceobj, 'pycsw:Publisher', md.provider.name)
+    _set(context, serviceobj, 'pycsw:Contributor', md.provider.contact.name)
+    _set(context, serviceobj, 'pycsw:OrganizationName', md.provider.contact.name)
+    _set(context, serviceobj, 'pycsw:AccessConstraints', md.identification.accessconstraints)
+    _set(context, serviceobj, 'pycsw:OtherConstraints', md.identification.fees)
+    _set(context, serviceobj, 'pycsw:Source', record)
+    _set(context, serviceobj, 'pycsw:Format', md.identification.type)
+
+    for c in md.contents:
+        if md.contents[c].parent is None:
+            bbox = md.contents[c].boundingBoxWGS84
+            tmp = '%s,%s,%s,%s' % (bbox[0], bbox[1], bbox[2], bbox[3])
+            _set(context, serviceobj, 'pycsw:BoundingBox', util.bbox2wktpolygon(tmp))
+            break
+    _set(context, serviceobj, 'pycsw:CRS', 'urn:ogc:def:crs:EPSG:6.11:4326')
+    _set(context, serviceobj, 'pycsw:DistanceUOM', 'degrees')
+    _set(context, serviceobj, 'pycsw:ServiceType', 'OGC:WMTS')
+    _set(context, serviceobj, 'pycsw:ServiceTypeVersion', md.identification.version)
+    _set(context, serviceobj, 'pycsw:Operation', ','.join([d.name for d in md.operations]))
+    _set(context, serviceobj, 'pycsw:OperatesOn', ','.join(list(md.contents)))
+    _set(context, serviceobj, 'pycsw:CouplingType', 'tight')
+
+    links = [
+        '%s,OGC-WMTS Web Map Service,OGC:WMTS,%s' % (identifier, md.url),
+    ]
+
+    _set(context, serviceobj, 'pycsw:Links', '^'.join(links))
+    _set(context, serviceobj, 'pycsw:XML', caps2iso(serviceobj, md, context))
+
+    recobjs.append(serviceobj)
+
+    # generate record for each layer
+
+    LOGGER.debug('Harvesting %d WMTS layers' % len(md.contents))
+
+    for layer in md.contents:
+        recobj = repos.dataset()
+        keywords = ''
+        identifier2 = '%s-%s' % (identifier, md.contents[layer].name)
+        _set(context, recobj, 'pycsw:Identifier', identifier2)
+        _set(context, recobj, 'pycsw:Typename', 'csw:Record')
+        _set(context, recobj, 'pycsw:Schema', 'http://www.opengis.net/wmts/1.0')
+        _set(context, recobj, 'pycsw:MdSource', record)
+        _set(context, recobj, 'pycsw:InsertDate', util.get_today_and_now())
+        _set(context, recobj, 'pycsw:Type', 'dataset')
+        _set(context, recobj, 'pycsw:ParentIdentifier', identifier)
+        if md.contents[layer].title:
+             _set(context, recobj, 'pycsw:Title', md.contents[layer].title)
+        else:
+            _set(context, recobj, 'pycsw:Title', "")
+        if md.contents[layer].abstract:
+            _set(context, recobj, 'pycsw:Abstract', md.contents[layer].abstract)
+        else:
+            _set(context, recobj, 'pycsw:Abstract', "")
+        if hasattr(md.contents[layer], 'keywords'):  # safeguard against older OWSLib installs
+            keywords = ','.join(md.contents[layer].keywords)
+        _set(context, recobj, 'pycsw:Keywords', keywords)
+
+        _set(context, recobj, 'pycsw:AnyText',
+             util.get_anytext([md.contents[layer].title,
+                              md.contents[layer].abstract,
+                             ','.join(keywords)
+                             ]))
+
+        bbox = md.contents[layer].boundingBoxWGS84
+
+        if bbox is not None:
+            tmp = '%s,%s,%s,%s' % (bbox[0], bbox[1], bbox[2], bbox[3])
+            _set(context, recobj, 'pycsw:BoundingBox', util.bbox2wktpolygon(tmp))
+            _set(context, recobj, 'pycsw:CRS', 'urn:ogc:def:crs:EPSG:6.11:4326')
+            _set(context, recobj, 'pycsw:DistanceUOM', 'degrees')
+        else:
+            bbox = md.contents[layer].boundingBox
+            if bbox:
+                tmp = '%s,%s,%s,%s' % (bbox[0], bbox[1], bbox[2], bbox[3])
+                _set(context, recobj, 'pycsw:BoundingBox', util.bbox2wktpolygon(tmp))
+                _set(context, recobj, 'pycsw:CRS', 'urn:ogc:def:crs:EPSG:6.11:%s' % \
+                bbox[-1].split(':')[1])
+
+
+        params = {
+            'service': 'WMTS',
+            'version': '1.0.0',
+            'request': 'GetTile',
+            'layer': md.contents[layer].name,
+        }
+
+        links = [
+           '%s,OGC-Web Map Tile Service,OGC:WMTS,%s' % (md.contents[layer].name, md.url),
+            '%s,Web image thumbnail (URL),WWW:LINK-1.0-http--image-thumbnail,%s' % (md.contents[layer].name, build_get_url(md.url, params))
+        ]
+
+        _set(context, recobj, 'pycsw:Links', '^'.join(links))
+        _set(context, recobj, 'pycsw:XML', caps2iso(recobj, md, context))
+
+        recobjs.append(recobj)
+
+    return recobjs
+
+
 def _parse_wfs(context, repos, record, identifier):
 
     from owslib.wfs import WebFeatureService
@@ -772,7 +907,7 @@ def _parse_fgdc(context, repos, exml):
     if md.idinfo.datasetid is not None:  # we need an identifier
         _set(context, recobj, 'pycsw:Identifier', md.idinfo.datasetid)
     else:  # generate one ourselves
-        _set(context, recobj, 'pycsw:Identifier', uuid.uuid1().get_urn())
+        _set(context, recobj, 'pycsw:Identifier', uuid.uuid1().urn)
 
     _set(context, recobj, 'pycsw:Typename', 'fgdc:metadata')
     _set(context, recobj, 'pycsw:Schema', context.namespaces['fgdc'])
@@ -844,6 +979,111 @@ def _parse_fgdc(context, repos, exml):
 
     return recobj
 
+def _parse_gm03(context, repos, exml):
+
+    def get_value_by_language(pt_group, language, pt_type='text'):
+        for ptg in pt_group:
+            if ptg.language == language:
+                if pt_type == 'url':
+                    val = ptg.plain_url
+                else:  # 'text'
+                    val = ptg.plain_text
+                return val
+
+    from owslib.gm03 import GM03
+
+    recobj = repos.dataset()
+    links = []
+
+    md = GM03(exml)
+
+    if hasattr(md.data, 'core'):
+        data = md.data.core
+    elif hasattr(md.data, 'comprehensive'):
+        data = md.data.comprehensive
+
+    language = data.metadata.language
+
+    _set(context, recobj, 'pycsw:Identifier', data.metadata.file_identifier)
+    _set(context, recobj, 'pycsw:Typename', 'gm03:TRANSFER')
+    _set(context, recobj, 'pycsw:Schema', context.namespaces['gm03'])
+    _set(context, recobj, 'pycsw:MdSource', 'local')
+    _set(context, recobj, 'pycsw:InsertDate', util.get_today_and_now())
+    _set(context, recobj, 'pycsw:XML', md.xml)
+    _set(context, recobj, 'pycsw:AnyText', util.get_anytext(exml))
+    _set(context, recobj, 'pycsw:Language', data.metadata.language)
+    _set(context, recobj, 'pycsw:Type', data.metadata.hierarchy_level[0])
+    _set(context, recobj, 'pycsw:Date', data.metadata.date_stamp)
+
+    for dt in data.date:
+        if dt.date_type == 'modified':
+            _set(context, recobj, 'pycsw:Modified', data.date.date)
+        elif dt.date_type == 'creation':
+            _set(context, recobj, 'pycsw:CreationDate', data.date.date)
+        elif dt.date_type == 'publication':
+            _set(context, recobj, 'pycsw:PublicationDate', data.date.date)
+        elif dt.date_type == 'revision':
+            _set(context, recobj, 'pycsw:RevisionDate', data.date.date)
+
+    if hasattr(data, 'metadata_point_of_contact'):
+        _set(context, recobj, 'pycsw:ResponsiblePartyRole', data.metadata_point_of_contact.role)
+
+    _set(context, recobj, 'pycsw:Source', data.metadata.dataset_uri)
+    _set(context, recobj, 'pycsw:CRS','urn:ogc:def:crs:EPSG:6.11:4326')
+
+    if hasattr(data, 'citation'):
+        _set(context, recobj, 'pycsw:Title', get_value_by_language(data.citation.title.pt_group, language))
+
+    if hasattr(data, 'data_identification'):
+        _set(context, recobj, 'pycsw:Abstract', get_value_by_language(data.data_identification.abstract.pt_group, language))
+        _set(context, recobj, 'pycsw:TopicCategory', data.data_identification.topic_category)
+        _set(context, recobj, 'pycsw:ResourceLanguage', data.data_identification.language)
+
+    if hasattr(data, 'format'):
+        _set(context, recobj, 'pycsw:Format', data.format.name)
+
+    # bbox
+    if hasattr(data, 'geographic_bounding_box'):
+        try:
+            tmp = '%s,%s,%s,%s' % (data.geographic_bounding_box.west_bound_longitude,
+                                   data.geographic_bounding_box.south_bound_latitude,
+                                   data.geographic_bounding_box.east_bound_longitude,
+                                   data.geographic_bounding_box.north_bound_latitude)
+            _set(context, recobj, 'pycsw:BoundingBox', util.bbox2wktpolygon(tmp))
+        except:  # coordinates are corrupted, do not include
+            _set(context, recobj, 'pycsw:BoundingBox', None)
+    else:
+        _set(context, recobj, 'pycsw:BoundingBox', None)
+
+    # temporal extent
+    if hasattr(data, 'temporal_extent'):
+        if data.temporal_extent.extent['begin'] is not None and data.temporal_extent.extent['end'] is not None:
+            _set(context, recobj, 'pycsw:TempExtent_begin', data.temporal_extent.extent['begin'])
+            _set(context, recobj, 'pycsw:TempExtent_end', data.temporal_extent.extent['end'])
+
+    # online linkages
+    name = description = protocol = ''
+
+    if hasattr(data.online_resource, 'name'):
+        name = get_value_by_language(data.online_resource.name.pt_group, language)
+    if hasattr(data.online_resource, 'description'):
+        description = get_value_by_language(data.online_resource.description.pt_group, language)
+    linkage = get_value_by_language(data.online_resource.linkage.pt_group, language, 'url')
+
+    tmp = '%s,"%s",%s,%s' % (name, description, protocol, linkage)
+    links.append(tmp)
+
+    if len(links) > 0:
+        _set(context, recobj, 'pycsw:Links', '^'.join(links))
+
+    keywords = []
+    for kw in data.keywords:
+        keywords.append(get_value_by_language(kw.keyword.pt_group, language))
+        _set(context, recobj, 'pycsw:Keywords', ','.join(keywords))
+
+    # contacts
+    return recobj
+
 def _parse_iso(context, repos, exml):
 
     from owslib.iso import MD_Metadata
@@ -886,7 +1126,7 @@ def _parse_iso(context, repos, exml):
 
         if len(md.identification.resourcelanguage) > 0:
             _set(context, recobj, 'pycsw:ResourceLanguage', md.identification.resourcelanguage[0])
- 
+
         if hasattr(md.identification, 'bbox'):
             bbox = md.identification.bbox
         else:
@@ -911,16 +1151,16 @@ def _parse_iso(context, repos, exml):
             all_orgs = set([item.organization for item in md.identification.contributor if hasattr(item, 'organization') and item.organization is not None])
             _set(context, recobj, 'pycsw:Contributor', ';'.join(all_orgs))
 
-        if (hasattr(md.identification, 'contact') and 
+        if (hasattr(md.identification, 'contact') and
             len(md.identification.contact) > 0):
             all_orgs = set([item.organization for item in md.identification.contact if hasattr(item, 'organization') and item.organization is not None])
             _set(context, recobj, 'pycsw:OrganizationName', ';'.join(all_orgs))
 
         if len(md.identification.securityconstraints) > 0:
-            _set(context, recobj, 'pycsw:SecurityConstraints', 
+            _set(context, recobj, 'pycsw:SecurityConstraints',
             md.identification.securityconstraints[0])
         if len(md.identification.accessconstraints) > 0:
-            _set(context, recobj, 'pycsw:AccessConstraints', 
+            _set(context, recobj, 'pycsw:AccessConstraints',
             md.identification.accessconstraints[0])
         if len(md.identification.otherconstraints) > 0:
             _set(context, recobj, 'pycsw:OtherConstraints', md.identification.otherconstraints[0])
@@ -958,7 +1198,7 @@ def _parse_iso(context, repos, exml):
         _set(context, recobj, 'pycsw:ServiceTypeVersion', md.serviceidentification.version)
 
         _set(context, recobj, 'pycsw:CouplingType', md.serviceidentification.couplingtype)
-   
+
     service_types = []
     for smd in md.identificationinfo:
         if smd.identtype == 'service' and smd.type is not None:
@@ -966,14 +1206,14 @@ def _parse_iso(context, repos, exml):
 
     _set(context, recobj, 'pycsw:ServiceType', ','.join(service_types))
 
-        #if len(md.serviceidentification.operateson) > 0: 
-        #    _set(context, recobj, 'pycsw:operateson = VARCHAR(32), 
-        #_set(context, recobj, 'pycsw:operation VARCHAR(32), 
-        #_set(context, recobj, 'pycsw:operatesonidentifier VARCHAR(32), 
-        #_set(context, recobj, 'pycsw:operatesoname VARCHAR(32), 
+        #if len(md.serviceidentification.operateson) > 0:
+        #    _set(context, recobj, 'pycsw:operateson = VARCHAR(32),
+        #_set(context, recobj, 'pycsw:operation VARCHAR(32),
+        #_set(context, recobj, 'pycsw:operatesonidentifier VARCHAR(32),
+        #_set(context, recobj, 'pycsw:operatesoname VARCHAR(32),
 
 
-    if hasattr(md.identification, 'dataquality'):     
+    if hasattr(md.identification, 'dataquality'):
         _set(context, recobj, 'pycsw:Degree', md.dataquality.conformancedegree)
         _set(context, recobj, 'pycsw:Lineage', md.dataquality.lineage)
         _set(context, recobj, 'pycsw:SpecificationTitle', md.dataquality.specificationtitle)
@@ -1109,6 +1349,6 @@ def caps2iso(record, caps, context):
     apiso_obj = APISO(context.model, context.namespaces, context)
     apiso_obj.ogc_schemas_base = 'http://schemas.opengis.net'
     apiso_obj.url = context.url
-    queryables = dict(apiso_obj.repository['queryables']['SupportedISOQueryables'].items() + apiso_obj.repository['queryables']['SupportedISOQueryables'].items())
+    queryables = dict(apiso_obj.repository['queryables']['SupportedISOQueryables'].items())
     iso_xml = apiso_obj.write_record(record, 'full', 'http://www.isotc211.org/2005/gmd', queryables, caps)
     return etree.tostring(iso_xml)
diff --git a/pycsw/repository.py b/pycsw/core/repository.py
similarity index 99%
rename from pycsw/repository.py
rename to pycsw/core/repository.py
index 9cb6415..aba9369 100644
--- a/pycsw/repository.py
+++ b/pycsw/core/repository.py
@@ -1,10 +1,11 @@
-# -*- coding: iso-8859-15 -*-
+# -*- coding: utf-8 -*-
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #          Angelos Tzotsos <tzotsos at gmail.com>
 #
-# Copyright (c) 2010 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
+# Copyright (c) 2015 Angelos Tzotsos
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -35,7 +36,7 @@ from sqlalchemy import create_engine, asc, desc, func, __version__, select
 from sqlalchemy.sql import text
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import create_session
-from pycsw import util
+from pycsw.core import util
 
 LOGGER = logging.getLogger(__name__)
 
@@ -175,7 +176,7 @@ class Repository(object):
                 self.queryables[qname] = {}
 
                 for qkey, qvalue in \
-                self.context.model['typenames'][tname]['queryables'][qname].iteritems():
+                self.context.model['typenames'][tname]['queryables'][qname].items():
                     self.queryables[qname][qkey] = qvalue
 
         # flatten all queryables
@@ -194,6 +195,7 @@ class Repository(object):
 
     def query_ids(self, ids):
         ''' Query by list of identifiers '''
+
         column = getattr(self.dataset, \
         self.context.md_core_model['mappings']['pycsw:Identifier'])
 
diff --git a/bin/pycsw-pylint.sh b/pycsw/core/schemas/catalog.xml
old mode 100755
new mode 100644
similarity index 58%
copy from bin/pycsw-pylint.sh
copy to pycsw/core/schemas/catalog.xml
index 43e262c..c8f494c
--- a/bin/pycsw-pylint.sh
+++ b/pycsw/core/schemas/catalog.xml
@@ -1,9 +1,10 @@
-#!/bin/sh
+<?xml version="1.0"?>
+<!--
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis at gmail.com>
 #
-# Copyright (c) 2011 Tom Kralidis
+# Copyright (c) 2015 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -27,8 +28,13 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 # =================================================================
-
-# run pylint without warnings about docstrings on first line
-# and suppress reporting
-
-pylint -r n -d C0111 $1
+-->
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://schemas.opengis.net/iso/" rewritePrefix="../../plugins/profiles/apiso/schemas/ogc/iso/"/>
+  <rewriteURI systemIdStartString="http://schemas.opengis.net/iso/" rewritePrefix="../../plugins/profiles/apiso/schemas/ogc/iso/"/>
+  <rewriteSystem systemIdStartString="http://schemas.opengis.net/" rewritePrefix="ogc/"/>
+  <rewriteURI systemIdStartString="http://schemas.opengis.net/" rewritePrefix="ogc/"/>
+  <rewriteSystem systemIdStartString="http://www.w3.org/" rewritePrefix="w3c/"/>
+  <rewriteURI uriStartString="http://www.w3.org/" rewritePrefix="w3c/"/>
+</catalog>
diff --git a/pycsw/schemas/ogc/OGC-SOFTWARE-NOTICE.txt b/pycsw/core/schemas/ogc/OGC-SOFTWARE-NOTICE.txt
similarity index 100%
rename from pycsw/schemas/ogc/OGC-SOFTWARE-NOTICE.txt
rename to pycsw/core/schemas/ogc/OGC-SOFTWARE-NOTICE.txt
diff --git a/pycsw/schemas/ogc/README.txt b/pycsw/core/schemas/ogc/README.txt
similarity index 100%
rename from pycsw/schemas/ogc/README.txt
rename to pycsw/core/schemas/ogc/README.txt
diff --git a/pycsw/schemas/ogc/csw/2.0.2/CSW-discovery.xsd b/pycsw/core/schemas/ogc/csw/2.0.2/CSW-discovery.xsd
similarity index 100%
rename from pycsw/schemas/ogc/csw/2.0.2/CSW-discovery.xsd
rename to pycsw/core/schemas/ogc/csw/2.0.2/CSW-discovery.xsd
diff --git a/pycsw/schemas/ogc/csw/2.0.2/CSW-publication.xsd b/pycsw/core/schemas/ogc/csw/2.0.2/CSW-publication.xsd
similarity index 100%
rename from pycsw/schemas/ogc/csw/2.0.2/CSW-publication.xsd
rename to pycsw/core/schemas/ogc/csw/2.0.2/CSW-publication.xsd
diff --git a/pycsw/schemas/ogc/csw/2.0.2/rec-dcmes.xsd b/pycsw/core/schemas/ogc/csw/2.0.2/rec-dcmes.xsd
similarity index 100%
rename from pycsw/schemas/ogc/csw/2.0.2/rec-dcmes.xsd
rename to pycsw/core/schemas/ogc/csw/2.0.2/rec-dcmes.xsd
diff --git a/pycsw/schemas/ogc/csw/2.0.2/rec-dcterms.xsd b/pycsw/core/schemas/ogc/csw/2.0.2/rec-dcterms.xsd
similarity index 100%
copy from pycsw/schemas/ogc/csw/2.0.2/rec-dcterms.xsd
copy to pycsw/core/schemas/ogc/csw/2.0.2/rec-dcterms.xsd
diff --git a/pycsw/schemas/ogc/csw/2.0.2/record.xsd b/pycsw/core/schemas/ogc/csw/2.0.2/record.xsd
similarity index 100%
rename from pycsw/schemas/ogc/csw/2.0.2/record.xsd
rename to pycsw/core/schemas/ogc/csw/2.0.2/record.xsd
diff --git a/pycsw/core/schemas/ogc/csw/3.0/README.txt b/pycsw/core/schemas/ogc/csw/3.0/README.txt
new file mode 100644
index 0000000..6d80d9c
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/README.txt
@@ -0,0 +1,25 @@
+# 2015-02-13
+
+The unofficial CSW 3.0 schema can be tested from here.
+
+http://test.schemas.opengis.net/csw/3.0/
+
+I did make one change to the examples/Capabilities.xml
+
+Thanks,
+
+kevin
+
+####################################################################
+--- csw3_0_0-beta-20150123-pv/csw/3.0/examples/Capabilities.xml
++++ csw3_0_0-beta-20150123-pv-s1/csw/3.0/examples/Capabilities.xml
+@@ -15,7 +15,7 @@
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.opengis.net/cat/csw/3.0
+-                       http://www.opengis.net/csw/3.0/cswAll.xsd
++                       http://schemas.opengis.net/csw/3.0/cswAll.xsd
+                        http://www.opengis.net/gml/3.2
+                        http://schemas.opengis.net/gml/3.2.1/gml.xsd
+                        http://www.w3.org/1999/xlink
+
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswAll.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswAll.xsd
new file mode 100644
index 0000000..2af2e0c
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswAll.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0" id="cswAll">
+   <xsd:annotation>
+      <xsd:appinfo>cswAll.xsd 2012-06-04</xsd:appinfo>
+      <xsd:documentation>
+         This XML Schema Document includes and imports, directly or
+         indirectly, all the XML Schemas defined by the Catalogue Service
+         Specification.
+      
+         CSW is an OGC Standard.
+
+         Copyright (c) 2012 Open Geospatial Consortium, Inc.
+         All Rights Reserved.
+         To obtain additional rights see: http://www.opengeospatial.org/legal/.
+      </xsd:documentation>
+   </xsd:annotation>
+   <!-- =================================================================== -->
+   <!-- includes and imports                                                -->
+   <!-- =================================================================== -->
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <xsd:include schemaLocation="cswGetCapabilities.xsd"/>
+   <xsd:include schemaLocation="cswGetDomain.xsd"/>
+   <xsd:include schemaLocation="cswGetRecords.xsd"/>
+   <xsd:include schemaLocation="cswGetRecordById.xsd"/>
+   <xsd:include schemaLocation="cswTransaction.xsd"/>
+   <xsd:include schemaLocation="cswHarvest.xsd"/>
+   <xsd:include schemaLocation="cswUnHarvest.xsd"/>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswCommon.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswCommon.xsd
new file mode 100644
index 0000000..d318e6f
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswCommon.xsd
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:ows="http://www.opengis.net/ows/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswCommon">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswCommons.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines commen elements used in the CSW schemas.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="record.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/ows/2.0"
+        schemaLocation="../../ows/2.0/owsAll.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/fes/2.0"
+        schemaLocation="../../filter/2.0/filterAll.xsd"/>
+   <!-- ==================================================================== -->
+   <!-- REQUEST BASE TYPE                                                  -->
+   <!-- ==================================================================== -->
+   <xsd:complexType name="RequestBaseType" abstract="true" id="RequestBaseType">
+      <xsd:annotation>
+         <xsd:documentation>
+            Base type for all request messages except GetCapabilities.
+            The attributes identify the relevant service type and version.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:attribute name="service" type="ows:ServiceType"
+                     use="optional" default="CSW"/>
+      <xsd:attribute name="version" type="ows:VersionType"
+                     use="optional" default="3.0.0"/>
+   </xsd:complexType>
+   <!-- ==================================================================== -->
+   <!-- ACKNOWLEDGEMENT                                                    -->
+   <!-- ==================================================================== -->
+   <xsd:element name="Acknowledgement"
+                type="csw30:AcknowledgementType" id="Acknowledgement"/>
+   <xsd:complexType name="AcknowledgementType" id="AcknowledgementType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            This is a general acknowledgement response message for all requests 
+            that may be processed in an asynchronous manner.
+            EchoedRequest - Echoes the submitted request message
+            RequestId     - identifier for polling purposes (if no response 
+                            handler is available, or the URL scheme is
+                            unsupported)
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="EchoedRequest" type="csw30:EchoedRequestType"/>
+         <xsd:element name="RequestId" type="xsd:anyURI" minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="timeStamp" type="xsd:dateTime" use="required"/>
+   </xsd:complexType>
+   <xsd:complexType name="EchoedRequestType" id="EchoedRequestType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Includes a copy of the request message body.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:any namespace="##any" processContents="lax"/>
+      </xsd:sequence>
+   </xsd:complexType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswGetCapabilities.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswGetCapabilities.xsd
new file mode 100644
index 0000000..bf654b3
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswGetCapabilities.xsd
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:ows="http://www.opengis.net/ows/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswGetCapabilities">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswGetCapabilities.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the request and response messages
+         for the CSW 3.0 GetCapabilities operation.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/ows/2.0"
+      schemaLocation="../../ows/2.0/owsAll.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/fes/2.0"
+      schemaLocation="../../filter/2.0/filterAll.xsd"/>
+   <!-- =================================================================== -->
+   <!-- REQUEST                                                             -->
+   <!-- =================================================================== -->
+   <xsd:element name="GetCapabilities"
+                type="csw30:GetCapabilitiesType" id="GetCapabilities"/>
+   <xsd:complexType name="GetCapabilitiesType" id="GetCapabilitiesType">
+      <xsd:annotation>
+         <xsd:documentation>
+            Request for a description of service capabilities. See
+            OGC 06-121r9 for more information.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="ows:GetCapabilitiesType">
+            <xsd:attribute name="service" type="ows:ServiceType"
+                           use="optional" default="CSW">
+               <xsd:annotation>
+                  <xsd:documentation>
+                     OGC service type identifier (CSW).
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:attribute>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <!-- =================================================================== -->
+   <!-- RESPONSE                                                            -->
+   <!-- =================================================================== -->
+   <xsd:element name="Capabilities"
+                type="csw30:CapabilitiesType" id="Capabilities"/>
+   <xsd:complexType name="CapabilitiesType" id="CapabilitiesType">
+      <xsd:annotation>
+         <xsd:documentation>
+            This type extends ows:CapabilitiesBaseType defined in OGC 06-121r9
+            to include information about supported OGC filter components. A
+            profile may extend this type to describe additional capabilities.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="ows:CapabilitiesBaseType">
+            <xsd:sequence>
+               <xsd:annotation>
+                  <xsd:documentation>
+                     If sections parameter not specified, then
+                     Filter_Capabilities is mandatory. On full
+                     getCapabilities request, then all capabilities
+                     should be present. Document this in the specification,
+                     use annotation on minOccurs to make this point.
+                  </xsd:documentation>
+               </xsd:annotation>
+               <xsd:element ref="fes:Filter_Capabilities" minOccurs="0"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswGetDomain.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswGetDomain.xsd
new file mode 100644
index 0000000..3d434f3
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswGetDomain.xsd
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:gml="http://www.opengis.net/gml/3.2"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswGetDomain">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswGetDomain.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the request and response messages for the CSW 3.0
+         GetDomain operation.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/gml/3.2"
+      schemaLocation="../../gml/3.2.1/gml.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/fes/2.0"
+      schemaLocation="../../filter/2.0/filterAll.xsd"/>
+   <!-- =================================================================== -->
+   <!-- REQUEST                                                             -->
+   <!-- =================================================================== -->
+   <xsd:element name="GetDomain" type="csw30:GetDomainType" id="GetDomain"/>
+   <xsd:complexType name="GetDomainType" id="GetDomainType">
+      <xsd:complexContent>
+         <xsd:extension base="csw30:RequestBaseType">
+            <xsd:sequence maxOccurs="unbounded">
+               <xsd:choice>
+                  <xsd:sequence>
+                     <xsd:element name="ValueReference">
+                        <xsd:complexType>
+                           <xsd:simpleContent>
+                              <xsd:extension base="xsd:string">
+                                 <xsd:attribute name="resultType"
+                                                type="csw30:ResultTypeType"
+                                                use="optional"
+                                                default="available"/>
+                              </xsd:extension>
+                           </xsd:simpleContent>
+                        </xsd:complexType>
+                     </xsd:element>
+                     <xsd:element ref="fes:Filter" minOccurs="0"/>
+                  </xsd:sequence>
+                  <xsd:element name="ParameterName" type="xsd:string"/>
+               </xsd:choice>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:simpleType name="ResultTypeType">
+      <xsd:restriction base="xsd:string">
+         <xsd:enumeration value="possible">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Returns the set of supported possible values
+                  for the specified data component.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:enumeration>
+         <xsd:enumeration value="available">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Returns the set of available values for the
+                  specified data component.  This is typically
+                  a subset of the list of possible values.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:enumeration>
+      </xsd:restriction>
+   </xsd:simpleType>
+   <!-- =================================================================== -->
+   <!-- RESPONSE                                                            -->
+   <!-- =================================================================== -->
+   <xsd:element name="GetDomainResponse"
+                type="csw30:GetDomainResponseType" id="GetDomainResponse"/>
+   <xsd:complexType name="GetDomainResponseType" id="GetDomainResponseType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Returns the actual values for some property. In general this is
+            a subset of the value domain (that is, set of permissible values),
+            although in some cases these may be the same.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="DomainValues"
+                      type="csw30:DomainValuesType" maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="DomainValuesType" id="DomainValuesType">
+      <xsd:sequence>
+         <xsd:choice>
+            <xsd:element name="ValueReference" type="xsd:string"/>
+            <xsd:element name="ParameterName" type="xsd:anyURI"/>
+         </xsd:choice>
+         <xsd:choice minOccurs="0">
+            <xsd:element name="ListOfValues"
+                         type="csw30:ListOfValuesType"/>
+            <xsd:element name="ConceptualScheme"
+                         type="csw30:ConceptualSchemeType"
+                         maxOccurs="unbounded"/>
+            <xsd:element name="RangeOfValues"
+                         type="csw30:RangeOfValuesType"/>
+         </xsd:choice>
+      </xsd:sequence>
+      <xsd:attribute name="type" type="xsd:QName" use="required"/>
+      <xsd:attribute name="resultType"
+                     type="csw30:ResultTypeType" use="required"/>
+        
+   </xsd:complexType>
+   <xsd:complexType name="ListOfValuesType" id="ListOfValuesType">
+      <xsd:sequence>
+         <xsd:element name="Value" maxOccurs="unbounded">
+            <xsd:complexType>
+               <xsd:complexContent>
+                  <xsd:extension base="xsd:anyType">
+                     <xsd:attribute name="isDefault" type="xsd:boolean"
+                                    use="optional" default="false"/>
+                     <xsd:attribute name="count" type="xsd:nonNegativeInteger"
+                                    use="optional"/>
+                     <xsd:attribute name="uom" type="gml:UomIdentifier"
+                                    use="optional"/>
+                  </xsd:extension>
+               </xsd:complexContent>
+            </xsd:complexType>
+         </xsd:element>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="ConceptualSchemeType" id="ConceptualSchemeType">
+      <xsd:sequence>
+         <xsd:element name="Name" type="xsd:string"/>
+         <xsd:element name="Document" type="xsd:anyURI"/>
+         <xsd:element name="Authority" type="xsd:anyURI"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="RangeOfValuesType" id="RangeOfValuesType">
+      <xsd:sequence>
+         <xsd:element name="MinValue" type="xsd:anyType" minOccurs="0"/>
+         <xsd:element name="MaxValue" type="xsd:anyType" minOccurs="0"/>
+      </xsd:sequence>
+   </xsd:complexType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswGetRecordById.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswGetRecordById.xsd
new file mode 100644
index 0000000..b79cd38
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswGetRecordById.xsd
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:ows="http://www.opengis.net/ows/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswGetRecordById">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswGetRecordsById.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the request messages for the CSW 3.0
+         GetRecordById  operation.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <xsd:include schemaLocation="cswGetRecords.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/ows/2.0"
+               schemaLocation="../../ows/2.0/owsAll.xsd"/>
+   <!-- =================================================================== -->
+   <!-- REQUEST                                                             -->
+   <!-- =================================================================== -->
+   <xsd:element name="GetRecordById"
+                type="csw30:GetRecordByIdType" id="GetRecordById"/>
+   <xsd:complexType name="GetRecordByIdType" id="GetRecordByIdType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Convenience operation to retrieve default record representations 
+            by identifier.
+            Id - object identifier (a URI) that provides a reference to a 
+                 catalogue item (or a result set if the catalogue supports 
+                 persistent result sets).
+            ElementSetName - one of "brief, "summary", or "full"
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:RequestBaseType">
+            <xsd:sequence>
+               <xsd:element name="Id" type="xsd:anyURI"/>
+               <xsd:element ref="csw30:ElementSetName" minOccurs="0"/>
+            </xsd:sequence>
+            <xsd:attribute name="outputFormat" type="xsd:string"
+                           use="optional" default="application/xml"/>
+            <xsd:attribute name="outputSchema" type="xsd:anyURI"
+                           use="optional"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <!-- =================================================================== -->
+   <!-- RESPONSE                                                            -->
+   <!-- The response depends on the values of the outputFormat and output   -->
+   <!-- schema parameters.                                                  -->
+   <!-- =================================================================== -->
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswGetRecords.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswGetRecords.xsd
new file mode 100644
index 0000000..c001e4d
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswGetRecords.xsd
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:ows="http://www.opengis.net/ows/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswGetRecords">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswGetRecords.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the request and response messages for the CSW 3.0
+         GetRecords operation.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/ows/2.0"
+      schemaLocation="../../ows/2.0/owsAll.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/fes/2.0"
+      schemaLocation="../../filter/2.0/filterAll.xsd"/>
+   <!-- =================================================================== -->
+   <!-- REQUEST                                                             -->
+   <!-- =================================================================== -->
+   <xsd:element name="GetRecords" type="csw30:GetRecordsType" id="GetRecords"/>
+   <xsd:complexType name="GetRecordsType" id="GetRecordsType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            The principal means of searching the catalogue. The matching
+            catalogue entries may be included with the response. The client
+            may assign a requestId (absolute URI). A distributed search is
+            performed if the DistributedSearch element is present and the
+            catalogue is a member of a federation. Profiles may allow
+            alternative query expressions.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:RequestBaseType">
+            <xsd:sequence>
+               <xsd:element name="DistributedSearch"
+                  type="csw30:DistributedSearchType" minOccurs="0"/>
+               <xsd:element name="ResponseHandler" type="xsd:anyURI"
+                  minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:choice>
+                  <xsd:element ref="csw30:AbstractQuery"/>
+                  <xsd:any namespace="##other" processContents="strict"/>
+               </xsd:choice>
+            </xsd:sequence>
+            <xsd:attribute name="requestId" type="xsd:anyURI" use="optional">
+               <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                     requestId becomes mandatory in the case of a distributed
+                     search. Must be a unique Id (i.e. a UUID).
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attributeGroup ref="csw30:BasicRetrievalOptions"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:attributeGroup name="BasicRetrievalOptions" id="BasicRetrievalOptions">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Various attributes that specify basic retrieval options:
+            outputFormat   - the media type of the response message
+            outputSchema   - the preferred schema for records in the result set
+            startPosition  - requests a slice of the result set, starting
+                             at this position
+            maxRecords     - the maximum number of records to return. No
+                             records are  returned if maxRecords=0.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:attribute name="outputFormat" type="xsd:string"
+                     use="optional" default="application/xml"/>
+      <xsd:attribute name="outputSchema" type="xsd:anyURI" use="optional"/>
+      <xsd:attribute name="startPosition" type="xsd:positiveInteger"
+                     use="optional" default="1"/>
+      <xsd:attribute name="maxRecords" type="csw30:MaxRecordsType"
+                     use="optional" default="10"/>
+   </xsd:attributeGroup>
+   <xsd:simpleType name="MaxRecordsType">
+      <xsd:union memberTypes="xsd:nonNegativeInteger csw30:UnlimitedStringType"/>
+   </xsd:simpleType>
+   <xsd:simpleType name="UnlimitedStringType">
+      <xsd:restriction base="xsd:string">
+         <xsd:enumeration value="unlimited"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+   <xsd:complexType name="DistributedSearchType" id="DistributedSearchType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Governs the behaviour of a distributed search.
+            hopCount     - the maximum number of message hops before
+                           the search is terminated. Each catalogue node 
+                           decrements this value when the request is received, 
+                           and must not forward the request if hopCount=0.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="federatedCatalogues"
+                      type="csw30:FederatedCatalogueType"
+                      minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+               <xsd:documentation xml:lang="en">
+                  To restrict the number of catalogues of a federation which
+                  should be searched upon an optional list of those catalogues
+                  can be provided within the federatedCatatalogues parameter.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:sequence>
+      <xsd:attribute name="hopCount" type="xsd:positiveInteger"
+                     use="optional" default="2"/>
+      <xsd:attribute name="clientId" type="xsd:anyURI" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               An Id which uniquely identifies the requestor.
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+      <xsd:attribute name="distributedSearchId"
+                     type="xsd:anyURI" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               Id which uniquely identifies a complete client initiated
+               distributed search sequence/session.
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+      <xsd:attribute name="distributedSearchIdTimout" type="xsd:unsignedLong"
+                     use="optional" default="600">
+         <xsd:annotation>
+            <xsd:documentation>
+               Defines how long (sec) the distributedSearchId should be valid,
+               meaning how long a server involved in distributed search should
+               minimally store information related to the distributedSearchId.
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+   </xsd:complexType>
+   <xsd:complexType name="FederatedCatalogueType" id="FederatedCatalogueType">
+      <xsd:attribute name="catalogueURL" type="xsd:anyURI" use="required"/>
+      <xsd:attribute name="timeout" type="xsd:unsignedLong" use="optional">
+         <xsd:annotation>
+            <xsd:documentation>
+               For every catalogue in this list an optional timeout definition
+               (in msec) can be provided.
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+   </xsd:complexType>
+   <xsd:element name="AbstractQuery" type="csw30:AbstractQueryType"
+                abstract="true" id="AbstractQuery"/>
+   <xsd:complexType name="AbstractQueryType" abstract="true"
+                    id="AbstractQueryType"/>
+   <xsd:element name="Query" type="csw30:QueryType"
+                substitutionGroup="csw30:AbstractQuery" id="Query"/>
+   <xsd:complexType name="QueryType" id="QueryType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Specifies a query to execute against instances of one or
+            more object types. A set of ElementName elements may be included 
+            to specify an adhoc view of the csw30:Record instances in the
+            result set. Otherwise, use ElementSetName to specify a predefined
+            view.  The Constraint element contains a query filter expressed
+            in a supported query language. A sorting criterion that specifies
+            a property to sort by may be included.
+
+            typeNames - a list of object types to query.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:AbstractQueryType">
+            <xsd:sequence>
+               <xsd:choice>
+                  <xsd:element ref="csw30:ElementSetName"/>
+                  <xsd:element name="ElementName" type="xsd:string"
+                               maxOccurs="unbounded"/>
+               </xsd:choice>
+               <xsd:element ref="csw30:Constraint" minOccurs="0"/>
+               <xsd:element ref="fes:SortBy" minOccurs="0"/>
+            </xsd:sequence>
+            <xsd:attribute name="typeNames" type="csw30:TypeNameListType"
+                           use="required"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:simpleType name="TypeNameListType" id="TypeNameListType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            The exact syntax is defined in an application profile. If querying 
+            against the common record properties, only a single type may be 
+            specified (Record).
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:list itemType="xsd:QName"/>
+   </xsd:simpleType>
+   <xsd:element name="Constraint"
+                type="csw30:QueryConstraintType" id="Constraint"/>
+   <xsd:complexType name="QueryConstraintType" id="QueryConstraintType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            A search constraint that adheres to one of the following syntaxes:
+            Filter   - OGC filter expression
+            CqlText  - OGC CQL predicate
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice>
+         <xsd:element ref="fes:Filter"/>
+         <xsd:element name="CqlText" type="xsd:string"/>
+      </xsd:choice>
+      <xsd:attribute name="version" type="xsd:string" use="required">
+         <xsd:annotation>
+            <xsd:documentation>Query language version</xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+   </xsd:complexType>
+   <xsd:element name="ElementSetName"
+                type="csw30:ElementSetNameType" id="ElementSetName"/>
+   <xsd:complexType name="ElementSetNameType" id="ElementSetNameType">
+      <xsd:simpleContent>
+         <xsd:extension base="csw30:ElementSetType">
+            <xsd:attribute name="typeNames"
+                           type="csw30:TypeNameListType" use="optional"/>
+         </xsd:extension>
+      </xsd:simpleContent>
+   </xsd:complexType>
+   <xsd:simpleType name="RequiredElementSetNamesType"
+                   id="RequiredElementSetNamesType">
+      <xsd:annotation>
+         <xsd:documentation>
+             Named subsets of catalogue object properties; these
+             views are mapped to a specific information model and
+             are defined in an application profile.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:enumeration value="brief"/>
+         <xsd:enumeration value="summary"/>
+         <xsd:enumeration value="full"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+   <xsd:simpleType name="ElementSetType">
+      <xsd:union memberTypes="xsd:string csw30:RequiredElementSetNamesType"/>
+   </xsd:simpleType>
+   <!-- =================================================================== -->
+   <!-- RESPONSE                                                            -->
+   <!-- =================================================================== -->
+   <xsd:element name="GetRecordsResponse"
+                type="csw30:GetRecordsResponseType" id="GetRecordsResponse"/>
+   <xsd:complexType name="GetRecordsResponseType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            The response message for a GetRecords request. Some or all of the 
+            matching records may be included as children of the SearchResults 
+            element. The RequestId is only included if the client specified it.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="RequestId" type="xsd:anyURI" minOccurs="0"/>
+         <xsd:element name="SearchStatus" type="csw30:RequestStatusType"/>
+         <xsd:element name="SearchResults" type="csw30:SearchResultsType"/>
+      </xsd:sequence>
+      <xsd:attribute name="version" type="xsd:string" use="optional"/>
+   </xsd:complexType>
+   <xsd:complexType name="RequestStatusType" id="RequestStatusType">
+      <xsd:annotation>
+         <xsd:documentation>
+            This element provides information about the status of the
+            search request.
+
+            status    - status of the search
+            timestamp - the date and time when the result set was modified 
+                        (ISO 8601 format: YYYY-MM-DDThh:mm:ss[+|-]hh:mm).
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:attribute name="timestamp" type="xsd:dateTime" use="optional"/>
+   </xsd:complexType>
+   <xsd:simpleType name="ResultsStatusType" id="ResultsStatusType">
+      <xsd:annotation>
+         <xsd:documentation>
+            status of the items included in the resultset: 
+	    complete (all items found are included),
+            subset (subset of items found are included, but no further
+                    items in the requested range startPosition/maxRecords
+                    are available), 
+            processing (subset of items found are included, but server
+                        further processing to get the outstanding items
+                        in the requested range startPosition/maxRecords), 
+            none (no items are included).
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:enumeration value="subset"/>
+         <xsd:enumeration value="complete"/>
+         <xsd:enumeration value="processing"/>
+         <xsd:enumeration value="none"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+   <xsd:complexType name="SearchResultsType" id="SearchResultsType">
+      <xsd:annotation>
+         <xsd:documentation>
+            Includes representations of result set members if maxRecords > 0.
+            The items must conform to one of the csw30:Record views or a 
+            profile-specific representation. 
+         
+            resultSetId             - id of the result set (a URI).
+            elementSet              - The element set that has been returned
+                                      (e.g., "brief", "summary", "full")
+            recordSchema            - schema reference for included records(URI)
+            numberOfRecordsMatched  - number of records matched by the query
+            numberOfRecordsReturned - number of records returned to client
+            nextRecord              - position of next record in the result set
+                                      (0 if no records remain).
+            expires                 - the time instant when the result set
+                                      expires and is discarded (ISO8601 format)
+            elapsedTime             - runtime information of the search
+                                      within the federated catalogue
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:choice>
+            <xsd:element ref="csw30:AbstractRecord"
+                         minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:any namespace="##other" processContents="strict"
+                     minOccurs="0" maxOccurs="unbounded"/>
+         </xsd:choice>
+         <xsd:element ref="csw30:FederatedSearchResultBase"
+                      minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="resultSetId"
+                     type="xsd:anyURI" use="optional"/>
+      <xsd:attribute name="elementSet"
+                     type="csw30:ElementSetType" use="optional"/>
+      <xsd:attribute name="recordSchema"
+                     type="xsd:anyURI" use="optional"/>
+      <xsd:attribute name="numberOfRecordsMatched"
+                     type="xsd:nonNegativeInteger" use="required"/>
+      <xsd:attribute name="numberOfRecordsReturned"
+                     type="xsd:nonNegativeInteger" use="required"/>
+      <xsd:attribute name="nextRecord"
+                     type="xsd:nonNegativeInteger" use="optional"/>
+      <xsd:attribute name="expires" type="xsd:dateTime" use="optional"/>
+      <xsd:attribute name="elapsedTime" type="xsd:unsignedLong" use="optional"/>
+      <xsd:attribute name="status" type="csw30:ResultsStatusType"
+                     use="optional" default="subset"/>
+   </xsd:complexType>
+   <xsd:element name="FederatedSearchResultBase"
+                type="csw30:FederatedSearchResultBaseType"
+                abstract="true" id="FederatedSearchResultBase"/>
+   <xsd:complexType name="FederatedSearchResultBaseType"
+                    abstract="true" id="FederatedSearchResultBaseType">
+      <xsd:attribute name="catalogueURL" type="xsd:anyURI" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               The URL-prefix of the getCapabilities HTTP-GET operation
+               of the catalogue.
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+   </xsd:complexType>
+   <xsd:element name="FederatedSearchResult"
+                type="csw30:FederatedSearchResultType"
+                substitutionGroup="csw30:FederatedSearchResultBase"
+                id="FederatedSearchResult"/>
+   <xsd:complexType name="FederatedSearchResultType"
+                    id="FederatedSearchResultType">
+      <xsd:complexContent>
+         <xsd:extension base="csw30:FederatedSearchResultBaseType">
+            <xsd:sequence>
+               <xsd:element name="searchResult" type="csw30:SearchResultsType"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:element name="FederatedException" type="csw30:FederatedExceptionType"
+                substitutionGroup="csw30:FederatedSearchResultBase"
+                id="FederatedException"/>
+   <xsd:complexType name="FederatedExceptionType" id="FederatedExceptionType">
+      <xsd:complexContent>
+         <xsd:extension base="csw30:FederatedSearchResultBaseType">
+            <xsd:sequence>
+               <xsd:element ref="ows:ExceptionReport" maxOccurs="unbounded"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswHarvest.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswHarvest.xsd
new file mode 100644
index 0000000..d4fb171
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswHarvest.xsd
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswHarvest">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswHarvest.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the request and response messages for the 
+         Harvest operation.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <xsd:include schemaLocation="cswTransaction.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/fes/2.0"
+        schemaLocation="../../filter/2.0/filterAll.xsd"/>
+   <!-- =================================================================== -->
+   <!-- REQUEST                                                             -->
+   <!-- =================================================================== -->
+   <xsd:element name="Harvest" type="csw30:HarvestType" id="Harvest"/>
+   <xsd:complexType name="HarvestType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Requests that the catalogue attempt to harvest a resource from some 
+            network location identified by the source URL.
+   
+            Source          - a URL from which the resource is retrieved
+            ResourceType    - normally a URI that specifies the type of the
+                              resource being harvested
+            ResourceFormat  - a media type indicating the format of the 
+                              resource being harvested.  The default is 
+                              "application/xml".
+            ResponseHandler - a reference to some endpoint to which the 
+                              response shall be forwarded when the
+                              harvest operation has been completed
+            HarvestInterval - an interval expressed using the ISO 8601 syntax; 
+                              it specifies the interval between harvest 
+                              attempts (e.g., P6M indicates an interval of 
+                              six months).
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:RequestBaseType">
+            <xsd:sequence>
+               <xsd:element name="Source" type="xsd:anyURI"/>
+               <xsd:element name="ResourceType" type="xsd:string"/>
+               <xsd:element name="ResourceFormat" type="xsd:string"
+                            default="application/xml" minOccurs="0"/>
+               <xsd:element name="HarvestInterval" type="xsd:duration"
+                            minOccurs="0"/>
+               <xsd:element name="ResponseHandler" type="xsd:anyURI"
+                            minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <!-- =================================================================== -->
+   <!-- RESPONSE                                                            -->
+   <!-- =================================================================== -->
+   <xsd:element name="HarvestResponse" type="csw30:HarvestResponseType"
+      id="HarvestResponse">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            The content of the response varies depending on the presence of the 
+            ResponseHandler element. If present, then the catalogue should 
+            verify the request and respond immediately with an
+            csw30:Acknowledgement element in the response. The catalogue must
+            then attempt to harvest the resource at some later time and send
+            the response message to the location specified by the value of the
+            ResponseHandler element using the indicated protocol (e.g. ftp,
+            mailto, http).
+         
+            If the ResponseHandler element is absent, then the catalogue 
+            must attempt to harvest the resource immediately and include a 
+            TransactionResponse element in the response.
+
+            In any case, if the harvest attempt is successful the response 
+            shall include summary representations of the newly created 
+            catalogue item(s).
+         </xsd:documentation>
+      </xsd:annotation>
+   </xsd:element>
+   <xsd:complexType name="HarvestResponseType" id="HarvestResponseType">
+      <xsd:choice>
+         <xsd:element ref="csw30:Acknowledgement"/>
+         <xsd:element ref="csw30:TransactionResponse"/>
+      </xsd:choice>
+   </xsd:complexType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswTransaction.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswTransaction.xsd
new file mode 100644
index 0000000..04874ad
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswTransaction.xsd
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswTransaction">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswTransaction.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the request and response messages for the
+         Transaction operation.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <xsd:include schemaLocation="cswGetRecords.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/fes/2.0"
+        schemaLocation="../../filter/2.0/filterAll.xsd"/>
+   <!-- =================================================================== -->
+   <!-- REQUEST                                                             -->
+   <!-- =================================================================== -->
+   <xsd:element name="Transaction"
+                type="csw30:TransactionType" id="Transaction"/>
+   <xsd:complexType name="TransactionType" id="TransactionType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Users may insert, update, or delete catalogue entries. If the 
+            verboseResponse attribute has the value "true", then one or more 
+            csw30:InsertResult elements must be included in the response.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:RequestBaseType">
+            <xsd:sequence>
+               <xsd:choice maxOccurs="unbounded">
+                  <xsd:element name="Insert" type="csw30:InsertType"/>
+                  <xsd:element name="Update" type="csw30:UpdateType"/>
+                  <xsd:element name="Delete" type="csw30:DeleteType"/>
+               </xsd:choice>
+            </xsd:sequence>
+            <xsd:attribute name="verboseResponse" type="xsd:boolean"
+                           use="optional" default="false"/>
+            <xsd:attribute name="requestId" type="xsd:anyURI" use="optional"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="InsertType" id="InsertType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Submits one or more records to the catalogue. The representation
+            is defined by the application profile. The handle attribute
+            may be included to specify a local identifier for the action 
+            (it must be unique within the context of the transaction).
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:any namespace="##other" processContents="strict"
+                  maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="typeName" type="xsd:QName" use="optional"/>
+      <xsd:attribute name="handle" type="xsd:ID" use="optional"/>
+   </xsd:complexType>
+   <xsd:complexType name="UpdateType" id="UpdateType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Update statements may replace an entire record or only update part 
+            of a record:
+            1) To replace an existing record, include a new instance of the 
+               record;
+            2) To update selected properties of an existing record, include
+               a set of RecordProperty elements. The scope of the update
+               statement  is determined by the Constraint element.
+               The 'handle' is a local identifier for the action.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:choice>
+            <xsd:any namespace="##other" processContents="strict"/>
+            <xsd:sequence>
+               <xsd:element ref="csw30:RecordProperty" maxOccurs="unbounded"/>
+               <xsd:element ref="csw30:Constraint"/>
+            </xsd:sequence>
+         </xsd:choice>
+      </xsd:sequence>
+      <xsd:attribute name="typeName" type="xsd:QName" use="optional"/>
+      <xsd:attribute name="handle" type="xsd:ID" use="optional"/>
+   </xsd:complexType>
+   <xsd:complexType name="DeleteType" id="DeleteType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Deletes one or more catalogue items that satisfy some set of 
+            conditions.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element ref="csw30:Constraint"/>
+      </xsd:sequence>
+      <xsd:attribute name="typeName" type="xsd:QName" use="optional"/>
+      <xsd:attribute name="handle" type="xsd:ID" use="optional"/>
+   </xsd:complexType>
+   <xsd:element name="RecordProperty" type="csw30:RecordPropertyType">
+      <xsd:annotation>
+         <xsd:documentation>
+            The RecordProperty element is used to specify the new
+            value of a record property in an update statement.
+         </xsd:documentation>
+      </xsd:annotation>
+   </xsd:element>
+   <xsd:complexType name="RecordPropertyType">
+      <xsd:sequence>
+         <xsd:element name="Name" type="xsd:string">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The Name element contains the name of a property
+                  to be updated.  The name may be a path expression.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="Value" type="xsd:anyType" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The Value element contains the replacement value for the
+                  named property.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:sequence>
+   </xsd:complexType>
+   <!-- =================================================================== -->
+   <!-- RESPONSE                                                            -->
+   <!-- =================================================================== -->
+   <xsd:element name="TransactionResponse"
+                type="csw30:TransactionResponseType" id="TransactionResponse"/>
+   <xsd:complexType name="TransactionResponseType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            The response for a transaction request that was successfully
+            completed. If the transaction failed for any reason, a service 
+            exception report indicating a TransactionFailure is returned
+            instead.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="TransactionSummary"
+                      type="csw30:TransactionSummaryType"/>
+         <xsd:element name="InsertResult" type="csw30:InsertResultType"
+                      minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="version" type="xsd:string" use="optional"/>
+   </xsd:complexType>
+   <xsd:complexType name="TransactionSummaryType" id="TransactionSummaryType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Reports the total number of catalogue items modified by a
+            transaction request (i.e, inserted, updated, deleted).
+            If the client did not specify a requestId, the server may
+            assign one (a URI value).
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="totalInserted" type="xsd:nonNegativeInteger"
+                      minOccurs="0"/>
+         <xsd:element name="totalUpdated" type="xsd:nonNegativeInteger"
+                      minOccurs="0"/>
+         <xsd:element name="totalDeleted" type="xsd:nonNegativeInteger"
+                      minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="requestId" type="xsd:anyURI" use="optional"/>
+   </xsd:complexType>
+   <xsd:complexType name="InsertResultType" id="InsertResultType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Returns a "brief" view of any newly created catalogue records.
+            The handle attribute may reference a particular statement in
+            the corresponding transaction request.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element ref="csw30:BriefRecord" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="handleRef" type="xsd:anyURI" use="optional"/>
+   </xsd:complexType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/cswUnHarvest.xsd b/pycsw/core/schemas/ogc/csw/3.0/cswUnHarvest.xsd
new file mode 100644
index 0000000..1d8ca13
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/cswUnHarvest.xsd
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="cswUnHarvest">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/cswUnHarvest.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the request and response messages for the
+         UnHarvest operation.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:include schemaLocation="cswCommon.xsd"/>
+   <!-- =================================================================== -->
+   <!-- REQUEST                                                             -->
+   <!-- =================================================================== -->
+   <xsd:element name="Source" type="csw30:SourceType" id="SourceType"/>
+   <xsd:complexType name="SourceType">
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:anyURI">
+            <xsd:attribute name="resourceType"
+                           type="xsd:anyURI" use="required"/>
+         </xsd:extension>
+      </xsd:simpleContent>
+   </xsd:complexType>
+   <xsd:element name="UnHarvest" type="csw30:UnHarvestType" id="UnHarvest"/>
+   <xsd:complexType name="UnHarvestType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            Requests that the CSW unharvest a resource from the catalogue.
+            The resource to unharvest is identified by its source URL
+            (which must match exactly) and its resource type.
+
+            Source          - URL of the resourse to unharvest (must
+                              match exactly; including case)
+            ResourceType    - normally a URI that specifies the type of
+                              the resource being unharvested.
+            ResponseHandler - a reference to some endpoint to which the 
+                              response shall be forwarded when the
+                              unharvest operation has been completed
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:RequestBaseType">
+            <xsd:sequence>
+               <xsd:element ref="csw30:Source" maxOccurs="unbounded"/>
+               <xsd:element name="ResponseHandler" type="xsd:anyURI"
+                            minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+            <xsd:attribute name="outputFormat" type="xsd:string"
+                           default="text/xml"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <!-- =================================================================== -->
+   <!-- RESPONSE                                                            -->
+   <!-- =================================================================== -->
+   <xsd:element name="UnHarvestResponse" type="csw30:UnHarvestResponseType"
+      id="UnHarvestResponse">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            The response to an UnHarvest request is simply a list of
+            csw30:Source elements echoing what has been unharvested.
+         </xsd:documentation>
+      </xsd:annotation>
+   </xsd:element>
+   <xsd:complexType name="UnHarvestResponseType" id="UnHarvestResponseType">
+      <xsd:sequence>
+         <xsd:element ref="csw30:Source" maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/csw/3.0/rec-dcmes.xsd b/pycsw/core/schemas/ogc/csw/3.0/rec-dcmes.xsd
new file mode 100644
index 0000000..7eeef0d
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/rec-dcmes.xsd
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+   targetNamespace="http://purl.org/dc/elements/1.1/"
+   xmlns:xs="http://www.w3.org/2001/XMLSchema"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   elementFormDefault="qualified"
+   attributeFormDefault="unqualified"
+   version="3.0"
+   id="rec-dcmes">
+   <xs:annotation>
+      <xs:documentation source="http://dublincore.org/documents/dces/"
+         xml:lang="en">
+         This schema declares XML elements for the 15 Dublin Core elements in 
+         the "http://purl.org/dc/elements/1.1/" namespace.
+      </xs:documentation>
+   </xs:annotation>
+   <xs:complexType name="SimpleLiteral" mixed="true">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            This is the default type for all of the DC elements. It defines a 
+            complexType SimpleLiteral which permits mixed content but disallows 
+            child elements by use of minOcccurs/maxOccurs. However, this
+            complexType  does permit the derivation of other types which
+            would permit child elements. The scheme attribute may be used
+            as a qualifier to reference  an encoding scheme that describes
+            the value domain for a given property.
+         </xs:documentation>
+      </xs:annotation>
+      <xs:complexContent mixed="true">
+         <xs:restriction base="xs:anyType">
+            <xs:sequence>
+               <xs:any processContents="lax" minOccurs="0" maxOccurs="0"/>
+            </xs:sequence>
+            <xs:attribute name="scheme" type="xs:anyURI" use="optional"/>
+         </xs:restriction>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:element name="DC-element" type="dc:SimpleLiteral" abstract="true"/>
+   <xs:element name="title" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            A name given to the resource. Typically, Title will be a name by 
+            which the resource is formally known.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="creator" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            An entity primarily responsible for making the content of
+            the resource. Examples of Creator include a person, an
+            organization, or a service. Typically, the name of a Creator
+            should be used to indicate the entity.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="subject" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            A topic of the content of the resource. Typically, Subject will be 
+            expressed as keywords, key phrases, or classification codes that 
+            describe a topic of the resource. Recommended best practice is to 
+            select a value from a controlled vocabulary or formal
+            classification  scheme.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="description" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            An account of the content of the resource. Examples of Description 
+            include, but are not limited to, an abstract, table of contents, 
+            reference to a graphical representation of content, or free-text 
+            account of the content.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="publisher" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            An entity responsible for making the resource available.
+            Examples of Publisher include a person, an organization,
+            or a service. Typically, the name of a Publisher should
+            be used to indicate the entity.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="contributor" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            An entity responsible for making contributions to the content of 
+            the resource. Examples of Contributor include a person, an
+            organization,  or a service. Typically, the name of a Contributor
+            should be used to  indicate the entity.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="date" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            A date of an event in the lifecycle of the resource. Typically,
+            Date will be associated with the creation or availability of
+            the resource.  Recommended best practice for encoding the date
+            value is defined in a profile of ISO 8601 and includes (among
+            others) dates of the form YYYY-MM-DD.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="type" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            The nature or genre of the content of the resource. Type includes 
+            terms describing general categories, functions, genres, or
+            aggregation levels for content. Recommended best practice is to
+            select a value from a controlled vocabulary (for example, the
+            DCMI Type Vocabulary). To describe the physical or digital
+            manifestation of the resource, use the Format element.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="format" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            The physical or digital manifestation of the resource. Typically, 
+            Format will include the media-type or dimensions of the resource. 
+            Format may be used to identify the software, hardware, or other 
+            equipment needed to display or operate the resource. Examples of 
+            dimensions include size and duration. Recommended best practice
+            is to select a value from a controlled vocabulary (for example,
+            the list of Internet Media Types defining computer media formats).
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="identifier" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            An unambiguous reference to the resource within a given context. 
+            Recommended best practice is to identify the resource by means of a 
+            string or number conforming to a formal identification system.
+            Formal identification systems include but are not limited to the
+            Uniform Resource Identifier (URI) (including the Uniform Resource
+            Locator (URL)), the Digital Object Identifier (DOI), and the
+            International Standard Book Number (ISBN).
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="source" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            A Reference to a resource from which the present resource is
+            derived. The present resource may be derived from the Source
+            resource in whole or in part. Recommended best practice is
+            to identify the referenced resource by means of a string or
+            number conforming to a formal identification system.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="language" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            A language of the intellectual content of the resource. Recommended 
+            best practice is to use RFC 3066, which, in conjunction with ISO
+            639, defines two- and three-letter primary language tags with
+            optional subtags. Examples include "en" or "eng" for English,
+            "akk" for Akkadian, and "en-GB" for English used in the United
+            Kingdom.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="relation" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">A reference to a related resource. Recommended best practice is to 
+      identify the referenced resource by means of a string or number 
+      conforming to a formal identification system.</xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="coverage" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            The extent or scope of the content of the resource. Typically, 
+            Coverage will include spatial location (a place name or geographic 
+            coordinates), temporal period (a period label, date, or date
+            range), or jurisdiction (such as a named administrative entity).
+            Recommended best practice is to select a value from a controlled
+            vocabulary (for example, the Thesaurus of Geographic Names [TGN])
+            and to use, where appropriate, named places or time periods in
+            preference to numeric identifiers such as sets of coordinates
+            or date ranges.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:element name="rights" type="dc:SimpleLiteral"
+      substitutionGroup="dc:DC-element">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            Information about rights held in and over the resource. Typically, 
+            Rights will contain a rights management statement for the resource, 
+            or reference a service providing such information. Rights
+            information often encompasses Intellectual Property Rights (IPR),
+            Copyright, and various Property Rights. If the Rights element is
+            absent, no assumptions may be made about any rights held in or
+            over the resource.
+         </xs:documentation>
+      </xs:annotation>
+   </xs:element>
+   <xs:group name="DC-element-set">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            This group is included as a convenience for schema authors who need 
+            to refer to all the elements in the
+            "http://purl.org/dc/elements/1.1/" namespace.
+         </xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="dc:DC-element"/>
+         </xs:choice>
+      </xs:sequence>
+   </xs:group>
+   <xs:complexType name="elementContainer">
+      <xs:annotation>
+         <xs:documentation xml:lang="en">
+            This type definition is included as a convenience for schema
+            authors who need a container element for all of the DC elements.
+         </xs:documentation>
+      </xs:annotation>
+      <xs:choice>
+         <xs:group ref="dc:DC-element-set"/>
+      </xs:choice>
+   </xs:complexType>
+</xs:schema>
diff --git a/pycsw/schemas/ogc/csw/2.0.2/rec-dcterms.xsd b/pycsw/core/schemas/ogc/csw/3.0/rec-dcterms.xsd
similarity index 78%
rename from pycsw/schemas/ogc/csw/2.0.2/rec-dcterms.xsd
rename to pycsw/core/schemas/ogc/csw/3.0/rec-dcterms.xsd
index 57d15d8..ff0f607 100644
--- a/pycsw/schemas/ogc/csw/2.0.2/rec-dcterms.xsd
+++ b/pycsw/core/schemas/ogc/csw/3.0/rec-dcterms.xsd
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xs:schema id="dcmi-terms" targetNamespace="http://purl.org/dc/terms/"
-   xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
    xmlns:dct="http://purl.org/dc/terms/"
-   xmlns:dc="http://purl.org/dc/elements/1.1/" elementFormDefault="qualified"
-   attributeFormDefault="unqualified" version="2.0.2 2010-01-22">
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   targetNamespace="http://purl.org/dc/terms/" elementFormDefault="qualified"
+   attributeFormDefault="unqualified" version="3.0" id="dcmi-terms">
    <xs:annotation>
-      <xs:documentation xml:lang="en"
-         source="http://dublincore.org/documents/dcmi-terms/">This schema declares additional DCMI elements and element refinements 
-    in the "http://purl.org/dc/terms/" namespace.</xs:documentation>
+      <xs:documentation source="http://dublincore.org/documents/dcmi-terms/"
+         xml:lang="en">
+         This schema declares additional DCMI elements and element
+         refinements in the "http://purl.org/dc/terms/" namespace.
+      </xs:documentation>
    </xs:annotation>
-   <xs:import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="rec-dcmes.xsd"/>
+   <xs:import namespace="http://purl.org/dc/elements/1.1/"
+      schemaLocation="rec-dcmes.xsd"/>
    <xs:element name="abstract" type="dc:SimpleLiteral"
       substitutionGroup="dc:description"/>
    <xs:element name="accessRights" type="dc:SimpleLiteral"
@@ -52,7 +55,8 @@
       substitutionGroup="dc:relation"/>
    <xs:element name="isRequiredBy" type="dc:SimpleLiteral"
       substitutionGroup="dc:relation"/>
-   <xs:element name="issued" type="dc:SimpleLiteral" substitutionGroup="dc:date"/>
+   <xs:element name="issued" type="dc:SimpleLiteral"
+      substitutionGroup="dc:date"/>
    <xs:element name="isVersionOf" type="dc:SimpleLiteral"
       substitutionGroup="dc:relation"/>
    <xs:element name="license" type="dc:SimpleLiteral"
@@ -79,11 +83,14 @@
       substitutionGroup="dc:description"/>
    <xs:element name="temporal" type="dc:SimpleLiteral"
       substitutionGroup="dc:coverage"/>
-   <xs:element name="valid" type="dc:SimpleLiteral" substitutionGroup="dc:date"/>
+   <xs:element name="valid" type="dc:SimpleLiteral"
+      substitutionGroup="dc:date"/>
    <xs:group name="DCMI-terms">
       <xs:annotation>
-         <xs:documentation xml:lang="en">This group is included as a convenience for schema authors who need 
-      to refer to the complete set of DCMI metadata terms.</xs:documentation>
+         <xs:documentation xml:lang="en">
+            This group is included as a convenience for schema authors
+            who need  to refer to the complete set of DCMI metadata terms.
+         </xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:choice minOccurs="0" maxOccurs="unbounded">
diff --git a/pycsw/core/schemas/ogc/csw/3.0/record.xsd b/pycsw/core/schemas/ogc/csw/3.0/record.xsd
new file mode 100644
index 0000000..5572d29
--- /dev/null
+++ b/pycsw/core/schemas/ogc/csw/3.0/record.xsd
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/cat/csw/3.0"
+   xmlns:csw30="http://www.opengis.net/cat/csw/3.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:dct="http://purl.org/dc/terms/"
+   xmlns:ows="http://www.opengis.net/ows/2.0"
+   elementFormDefault="qualified"
+   version="3.0"
+   id="record">
+   <xsd:annotation>
+      <xsd:appinfo>
+         <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/">http://schemas.opengis.net/csw/3.0/record.xsd</dc:identifier>
+      </xsd:appinfo>
+      <xsd:documentation xml:lang="en">
+         This schema defines the basic record types that must be supported
+         by all CSW implementations. These correspond to full, summary, and
+         brief views based on DCMI metadata terms.
+      </xsd:documentation>
+   </xsd:annotation>
+   <xsd:import namespace="http://purl.org/dc/terms/"
+      schemaLocation="rec-dcterms.xsd"/>
+   <xsd:import namespace="http://purl.org/dc/elements/1.1/"
+      schemaLocation="rec-dcmes.xsd"/>
+   <xsd:import namespace="http://www.opengis.net/ows/2.0"
+      schemaLocation="../../ows/2.0/owsAll.xsd"/>
+   <xsd:element name="AbstractRecord" type="csw30:AbstractRecordType"
+      abstract="true" id="AbstractRecord"/>
+   <xsd:complexType name="AbstractRecordType" abstract="true"
+                    id="AbstractRecordType">
+      <xsd:attribute name="deleted" type="xsd:boolean"
+                     use="optional" default="false"/>
+   </xsd:complexType>
+   <xsd:element name="DCMIRecord" type="csw30:DCMIRecordType"
+                substitutionGroup="csw30:AbstractRecord"/>
+   <xsd:complexType name="DCMIRecordType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            This type encapsulates all of the standard DCMI metadata terms,
+            including the Dublin Core refinements; these terms may be mapped
+            to the profile-specific information model.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:AbstractRecordType">
+            <xsd:sequence>
+               <xsd:group ref="dct:DCMI-terms"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="TemporalExtentType">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+             A type for specifying the temporal extent of the data
+             item that a metadata record describes.  Omitting
+             begin/end implies infinity in that direction.  The
+             attribute "inclusive" can be used indicate whether
+             the boundary value in included in extent or not.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="begin" minOccurs="0">
+            <xsd:complexType>
+               <xsd:simpleContent>
+                  <xsd:extension base="xsd:dateTime">
+                     <xsd:attribute name="inclusive"
+                                    type="xsd:boolean" default="true"/>
+                  </xsd:extension>
+               </xsd:simpleContent>
+            </xsd:complexType>
+         </xsd:element>
+         <xsd:element name="end" minOccurs="0">
+            <xsd:complexType>
+               <xsd:simpleContent>
+                  <xsd:extension base="xsd:dateTime">
+                     <xsd:attribute name="inclusive"
+                                    type="xsd:boolean" default="true"/>
+                  </xsd:extension>
+               </xsd:simpleContent>
+            </xsd:complexType>
+         </xsd:element>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:element name="BriefRecord" type="csw30:BriefRecordType"
+                substitutionGroup="csw30:AbstractRecord"/>
+   <xsd:complexType name="BriefRecordType" final="#all">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            This type defines a brief representation of the common record
+            format.  It extends AbstractRecordType to include only the
+            dc:identifier and dc:type properties.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:AbstractRecordType">
+            <xsd:sequence>
+               <xsd:element ref="dc:identifier" maxOccurs="unbounded"/>
+               <xsd:element ref="dc:title" maxOccurs="unbounded"/>
+               <xsd:element ref="dc:type" minOccurs="0"/>
+               <xsd:element ref="ows:BoundingBox"
+                            minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:element name="SummaryRecord" type="csw30:SummaryRecordType"
+                substitutionGroup="csw30:AbstractRecord"/>
+   <xsd:complexType name="SummaryRecordType" final="#all">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            This type defines a summary representation of the common record
+            format.  It extends AbstractRecordType to include the core
+            properties.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:AbstractRecordType">
+            <xsd:sequence>
+               <xsd:element ref="dc:identifier" maxOccurs="unbounded"/>
+               <xsd:element ref="dc:title" maxOccurs="unbounded"/>
+               <xsd:element ref="dc:type" minOccurs="0"/>
+               <xsd:element ref="dc:subject"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="dc:format"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="dc:relation"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="dct:modified"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="dct:abstract"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="dct:spatial"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="ows:BoundingBox"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element name="TemporalExtent"
+                            type="csw30:TemporalExtentType"
+                            minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:element name="Record" type="csw30:RecordType"
+                substitutionGroup="csw30:AbstractRecord"/>
+   <xsd:complexType name="RecordType" final="#all">
+      <xsd:annotation>
+         <xsd:documentation xml:lang="en">
+            This type extends DCMIRecordType to add ows:BoundingBox;
+            it may be used to specify a spatial envelope for the
+            catalogued resource.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="csw30:DCMIRecordType">
+            <xsd:sequence>
+               <xsd:element name="AnyText" type="csw30:EmptyType"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="ows:BoundingBox"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element name="TemporalExtent"
+                            type="csw30:TemporalExtentType"
+                            minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="EmptyType"/>
+</xsd:schema>
diff --git a/pycsw/schemas/ogc/filter/1.1.0/expr.xsd b/pycsw/core/schemas/ogc/filter/1.1.0/expr.xsd
similarity index 100%
rename from pycsw/schemas/ogc/filter/1.1.0/expr.xsd
rename to pycsw/core/schemas/ogc/filter/1.1.0/expr.xsd
diff --git a/pycsw/schemas/ogc/filter/1.1.0/filter.xsd b/pycsw/core/schemas/ogc/filter/1.1.0/filter.xsd
similarity index 100%
rename from pycsw/schemas/ogc/filter/1.1.0/filter.xsd
rename to pycsw/core/schemas/ogc/filter/1.1.0/filter.xsd
diff --git a/pycsw/schemas/ogc/filter/1.1.0/filterCapabilities.xsd b/pycsw/core/schemas/ogc/filter/1.1.0/filterCapabilities.xsd
similarity index 100%
rename from pycsw/schemas/ogc/filter/1.1.0/filterCapabilities.xsd
rename to pycsw/core/schemas/ogc/filter/1.1.0/filterCapabilities.xsd
diff --git a/pycsw/schemas/ogc/filter/1.1.0/sort.xsd b/pycsw/core/schemas/ogc/filter/1.1.0/sort.xsd
similarity index 100%
copy from pycsw/schemas/ogc/filter/1.1.0/sort.xsd
copy to pycsw/core/schemas/ogc/filter/1.1.0/sort.xsd
diff --git a/pycsw/core/schemas/ogc/filter/2.0/expr.xsd b/pycsw/core/schemas/ogc/filter/2.0/expr.xsd
new file mode 100644
index 0000000..8513a20
--- /dev/null
+++ b/pycsw/core/schemas/ogc/filter/2.0/expr.xsd
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/fes/2.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="2.0.2">
+
+   <xsd:annotation>
+      <xsd:documentation>
+         Filter Encoding is an OGC Standard.
+         Copyright (c) 2010, 2014 Open Geospatial Consortium.
+         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+      </xsd:documentation>
+   </xsd:annotation>
+   
+   <xsd:include schemaLocation="filterAll.xsd"/>
+   
+   <xsd:element name="expression" abstract="true"/>
+
+   <xsd:element name="ValueReference" type="xsd:string"
+                substitutionGroup="fes:expression"/>
+
+   <xsd:element name="Function" type="fes:FunctionType"
+                substitutionGroup="fes:expression"/>
+   <xsd:complexType name="FunctionType">
+      <xsd:sequence>
+         <xsd:element ref="fes:expression"
+                      minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
+   </xsd:complexType> 
+
+   <xsd:element name="Literal" type="fes:LiteralType"
+                substitutionGroup="fes:expression"/>
+   <xsd:complexType name="LiteralType" mixed="true">
+      <xsd:sequence>
+         <xsd:any minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="type" type="xsd:QName"/>
+   </xsd:complexType>
+
+</xsd:schema>
+
diff --git a/pycsw/core/schemas/ogc/filter/2.0/filter.xsd b/pycsw/core/schemas/ogc/filter/2.0/filter.xsd
new file mode 100644
index 0000000..1a5dac8
--- /dev/null
+++ b/pycsw/core/schemas/ogc/filter/2.0/filter.xsd
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/fes/2.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="2.0.2">
+
+   <xsd:annotation>
+      <xsd:documentation>
+         Filter Encoding is an OGC Standard.
+         Copyright (c) 2010, 2014 Open Geospatial Consortium.
+         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+      </xsd:documentation>
+   </xsd:annotation>
+   
+   <xsd:include schemaLocation="filterAll.xsd"/>
+   <xsd:include schemaLocation="expr.xsd"/>
+   <xsd:include schemaLocation="query.xsd"/>
+   <xsd:include schemaLocation="filterCapabilities.xsd"/>
+
+   <xsd:element name="Filter"
+                type="fes:FilterType"
+                substitutionGroup="fes:AbstractSelectionClause"/>
+   <xsd:complexType name="FilterType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:AbstractSelectionClauseType">
+            <xsd:sequence>
+               <xsd:group ref="fes:FilterPredicates"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <!-- =================================================================== -->
+   <!-- FILTER PREDICATES                                                   -->
+   <!-- =================================================================== -->
+   <xsd:group name="FilterPredicates">
+     <xsd:choice>
+         <xsd:element ref="fes:comparisonOps"/>
+         <xsd:element ref="fes:spatialOps"/>
+         <xsd:element ref="fes:temporalOps"/>
+         <xsd:element ref="fes:logicOps"/>
+         <xsd:element ref="fes:extensionOps"/>
+         <xsd:element ref="fes:Function"/> 
+         <xsd:element ref="fes:_Id" maxOccurs="unbounded"/>
+      </xsd:choice>
+   </xsd:group>
+
+   <!-- =================================================================== -->
+   <!-- COMPARISON OPERATORS                                                -->
+   <!-- =================================================================== -->
+   <xsd:element name="comparisonOps"
+                type="fes:ComparisonOpsType"
+                abstract="true"/>
+   <xsd:complexType name="ComparisonOpsType" abstract="true"/>
+   <xsd:element name="PropertyIsEqualTo"
+                type="fes:BinaryComparisonOpType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsNotEqualTo"
+                type="fes:BinaryComparisonOpType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsLessThan"
+                type="fes:BinaryComparisonOpType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsGreaterThan"
+                type="fes:BinaryComparisonOpType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsLessThanOrEqualTo"
+                type="fes:BinaryComparisonOpType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsGreaterThanOrEqualTo"
+                type="fes:BinaryComparisonOpType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsLike"
+                type="fes:PropertyIsLikeType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsNull"
+                type="fes:PropertyIsNullType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsNil"
+                type="fes:PropertyIsNilType"
+                substitutionGroup="fes:comparisonOps"/>
+   <xsd:element name="PropertyIsBetween"
+                type="fes:PropertyIsBetweenType"
+                substitutionGroup="fes:comparisonOps"/>
+
+   <!-- =================================================================== -->
+   <!-- SPATIAL OPERATORS                                                   -->
+   <!-- =================================================================== -->
+   <xsd:element name="spatialOps" type="fes:SpatialOpsType" abstract="true"/>
+   <xsd:complexType name="SpatialOpsType" abstract="true"/>
+   <xsd:element name="Equals"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Disjoint"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Touches"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Within"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Overlaps"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Crosses"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Intersects"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Contains"
+                type="fes:BinarySpatialOpType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="DWithin"
+                type="fes:DistanceBufferType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="Beyond"
+                type="fes:DistanceBufferType"
+                substitutionGroup="fes:spatialOps"/>
+   <xsd:element name="BBOX"
+                type="fes:BBOXType"
+                substitutionGroup="fes:spatialOps"/>
+
+   <!-- =================================================================== -->
+   <!-- TEMPORAL OPERATORS                                                  -->
+   <!-- =================================================================== -->
+   <xsd:element name="temporalOps" type="fes:TemporalOpsType" abstract="true"/>
+   <xsd:complexType name="TemporalOpsType" abstract="true"/>
+   <xsd:element name="After"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="Before"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="Begins"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="BegunBy"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="TContains"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="During"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="EndedBy"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="Ends"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="TEquals"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="Meets"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="MetBy"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="TOverlaps"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="OverlappedBy"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+   <xsd:element name="AnyInteracts"
+                type="fes:BinaryTemporalOpType"
+                substitutionGroup="fes:temporalOps"/>
+
+   <!-- =================================================================== -->
+   <!-- LOGICAL OPERATORS                                                   -->
+   <!-- =================================================================== -->
+   <xsd:element name="logicOps" type="fes:LogicOpsType" abstract="true"/>
+   <xsd:complexType name="LogicOpsType" abstract="true"/>
+   <xsd:element name="And"
+                type="fes:BinaryLogicOpType"
+                substitutionGroup="fes:logicOps"/>
+   <xsd:element name="Or"
+                type="fes:BinaryLogicOpType"
+                substitutionGroup="fes:logicOps"/>
+   <xsd:element name="Not"
+                type="fes:UnaryLogicOpType"
+                substitutionGroup="fes:logicOps"/>
+
+   <!-- =================================================================== -->
+   <!-- EXTENSION OPERATORS                                                 -->
+   <!-- =================================================================== -->
+   <xsd:element name="extensionOps"
+                type="fes:ExtensionOpsType"
+                abstract="true"/>
+   <xsd:complexType name="ExtensionOpsType" abstract="true"/>
+
+   <!-- =================================================================== -->
+   <!-- OBJECT/RECORDS IDENTIFIERS                                          -->
+   <!-- =================================================================== -->
+   <xsd:element name="_Id" type="fes:AbstractIdType" abstract="true"/>
+   <xsd:complexType name="AbstractIdType" abstract="true"/>
+
+   <!-- =================================================================== -->
+   <!-- CONCRETE OBJECT IDENTIFIERS                                         -->
+   <!-- =================================================================== -->
+   <xsd:element name="ResourceId"
+                type="fes:ResourceIdType"
+                substitutionGroup="fes:_Id"/>
+   <xsd:complexType name="ResourceIdType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:AbstractIdType">
+            <xsd:attribute name="rid" type="xsd:string" use="required"/>
+            <xsd:attribute name="previousRid" type="xsd:string"/>
+            <xsd:attribute name="version" type="fes:VersionType"/>
+            <xsd:attribute name="startDate" type="xsd:dateTime"/>
+            <xsd:attribute name="endDate" type="xsd:dateTime"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:simpleType name="VersionType">
+      <xsd:union memberTypes="fes:VersionActionTokens
+                              xsd:positiveInteger
+                              xsd:dateTime">
+      </xsd:union>
+   </xsd:simpleType>
+   <xsd:simpleType name="VersionActionTokens">
+      <xsd:restriction base="xsd:string">
+         <xsd:enumeration value="FIRST"/>
+         <xsd:enumeration value="LAST"/>
+         <xsd:enumeration value="PREVIOUS"/>
+         <xsd:enumeration value="NEXT"/>
+         <xsd:enumeration value="ALL"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <!-- =================================================================== -->
+   <!-- TYPE DECLARATIONS                                                   -->
+   <!-- =================================================================== -->
+   <xsd:complexType name="BinaryComparisonOpType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:ComparisonOpsType">
+            <xsd:sequence>
+               <xsd:element ref="fes:expression" minOccurs="2" maxOccurs="2"/>
+            </xsd:sequence>
+            <xsd:attribute name="matchCase" type="xsd:boolean"
+                           use="optional" default="true"/>
+            <xsd:attribute name="matchAction" type="fes:MatchActionType"
+                           use="optional" default="Any"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:simpleType name="MatchActionType">
+      <xsd:restriction base="xsd:string">
+         <xsd:enumeration value="All"/>
+         <xsd:enumeration value="Any"/>
+         <xsd:enumeration value="One"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+   <xsd:complexType name="PropertyIsLikeType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:ComparisonOpsType">
+            <xsd:sequence>
+               <xsd:element ref="fes:expression" minOccurs="2" maxOccurs="2"/>
+            </xsd:sequence>
+            <xsd:attribute name="wildCard" type="xsd:string" use="required"/>
+            <xsd:attribute name="singleChar" type="xsd:string" use="required"/>
+            <xsd:attribute name="escapeChar" type="xsd:string" use="required"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="PropertyIsNullType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:ComparisonOpsType">
+            <xsd:sequence>
+               <xsd:element ref="fes:expression"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="PropertyIsNilType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:ComparisonOpsType">
+            <xsd:sequence>
+               <xsd:element ref="fes:expression"/>
+            </xsd:sequence>
+            <xsd:attribute name="nilReason" type="xsd:string"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="PropertyIsBetweenType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:ComparisonOpsType">
+            <xsd:sequence>
+               <xsd:element ref="fes:expression"/>
+               <xsd:element name="LowerBoundary" type="fes:LowerBoundaryType"/>
+               <xsd:element name="UpperBoundary" type="fes:UpperBoundaryType"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="LowerBoundaryType">
+      <xsd:choice>
+         <xsd:element ref="fes:expression"/>
+      </xsd:choice>
+   </xsd:complexType>
+   <xsd:complexType name="UpperBoundaryType">
+      <xsd:sequence>
+         <xsd:element ref="fes:expression"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="BinarySpatialOpType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:SpatialOpsType">
+            <xsd:choice maxOccurs="2">
+               <xsd:element ref="fes:expression"/>
+               <xsd:any namespace="##other"/>
+            </xsd:choice>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="BinaryTemporalOpType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:TemporalOpsType">
+            <xsd:choice maxOccurs="2">
+               <xsd:element ref="fes:expression"/>
+               <xsd:any namespace="##other"/>
+            </xsd:choice>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="BBOXType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:SpatialOpsType">
+            <xsd:choice maxOccurs="2">
+               <xsd:element ref="fes:expression"/>
+               <xsd:any namespace="##other"/>
+            </xsd:choice>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="DistanceBufferType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:SpatialOpsType">
+            <xsd:sequence>
+               <xsd:choice maxOccurs="2">
+                  <xsd:element ref="fes:expression"/>
+                  <xsd:any namespace="##other"/>
+               </xsd:choice>
+               <xsd:element name="Distance" type="fes:MeasureType"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="BinaryLogicOpType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:LogicOpsType">
+            <xsd:choice minOccurs="2" maxOccurs="unbounded">
+               <xsd:group ref="fes:FilterPredicates"/>
+            </xsd:choice>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="UnaryLogicOpType">
+      <xsd:complexContent>
+         <xsd:extension base="fes:LogicOpsType">
+            <xsd:sequence>
+               <xsd:choice>
+                  <xsd:group ref="fes:FilterPredicates"/>
+               </xsd:choice>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType name="MeasureType">
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:double">
+            <xsd:attribute name="uom" type="fes:UomIdentifier" use="required"/>
+         </xsd:extension>
+      </xsd:simpleContent>
+   </xsd:complexType>
+   <xsd:simpleType name="UomIdentifier">
+      <xsd:union memberTypes="fes:UomSymbol fes:UomURI"/>
+   </xsd:simpleType>
+   <xsd:simpleType name="UomSymbol">
+      <xsd:restriction base="xsd:string">
+         <xsd:pattern value="[^: \n\r\t]+"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+   <xsd:simpleType name="UomURI">
+      <xsd:restriction base="xsd:anyURI">
+         <xsd:pattern value="([a-zA-Z][a-zA-Z0-9\-\+\.]*:|\.\./|\./|#).*"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/filter/2.0/filterAll.xsd b/pycsw/core/schemas/ogc/filter/2.0/filterAll.xsd
new file mode 100644
index 0000000..70b5d78
--- /dev/null
+++ b/pycsw/core/schemas/ogc/filter/2.0/filterAll.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/fes/2.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="2.0.2">
+
+   <xsd:annotation>
+      <xsd:documentation>
+         This XML Schema document includes and imports, directly or indirectly,
+         all the XML Schema defined by the Filter Encoding Standard.
+
+         Filter Encoding is an OGC Standard.
+         Copyright (c) 2010, 2014 Open Geospatial Consortium.
+         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+      </xsd:documentation>
+   </xsd:annotation>
+
+   <xsd:include schemaLocation="query.xsd"/>
+   <xsd:include schemaLocation="filter.xsd"/>
+   <xsd:include schemaLocation="sort.xsd"/>
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/filter/2.0/filterCapabilities.xsd b/pycsw/core/schemas/ogc/filter/2.0/filterCapabilities.xsd
new file mode 100644
index 0000000..7dfd77d
--- /dev/null
+++ b/pycsw/core/schemas/ogc/filter/2.0/filterCapabilities.xsd
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/fes/2.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:ows="http://www.opengis.net/ows/1.1"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+   elementFormDefault="qualified"
+   version="2.0.2">
+   
+   <xsd:annotation>
+      <xsd:documentation>
+         This XML Schema defines OGC query filter capabilities documents.
+         
+         Filter Encoding is an OGC Standard.
+         Copyright (c) 2010, 2014 Open Geospatial Consortium.
+         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+      </xsd:documentation>
+   </xsd:annotation>
+
+   <xsd:include schemaLocation="filterAll.xsd"/>
+   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+               schemaLocation="../../../w3c/2001/xml.xsd"/>
+
+   <xsd:import namespace="http://www.opengis.net/ows/1.1"
+        schemaLocation="../../ows/1.1.0/owsAll.xsd"/>
+
+   <xsd:element name="Filter_Capabilities">
+      <xsd:complexType>
+         <xsd:sequence>
+            <xsd:element name="Conformance"
+                         type="fes:ConformanceType"/>
+            <xsd:element name="Id_Capabilities"
+                         type="fes:Id_CapabilitiesType"
+                         minOccurs="0"/>
+            <xsd:element name="Scalar_Capabilities"
+                         type="fes:Scalar_CapabilitiesType"
+                         minOccurs="0"/>
+            <xsd:element name="Spatial_Capabilities"
+                         type="fes:Spatial_CapabilitiesType"
+                         minOccurs="0"/>
+            <xsd:element name="Temporal_Capabilities"
+                         type="fes:Temporal_CapabilitiesType"
+                         minOccurs="0"/>
+            <xsd:element name="Functions"
+                         type="fes:AvailableFunctionsType" minOccurs="0"/>
+            <xsd:element name="Extended_Capabilities"
+                         type="fes:Extended_CapabilitiesType"
+                         minOccurs="0"/>
+         </xsd:sequence>
+      </xsd:complexType>
+   </xsd:element>
+
+   <!-- CONFORMANCE -->
+   <xsd:complexType name="ConformanceType">
+      <xsd:sequence>
+         <xsd:element name="Constraint"
+                      type="ows:DomainType" maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+
+   <!-- RESOURCE IDENTIFIERS -->
+   <xsd:complexType name="Id_CapabilitiesType">
+      <xsd:sequence>
+         <xsd:element name="ResourceIdentifier"
+                      type="fes:ResourceIdentifierType" maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="ResourceIdentifierType">
+      <xsd:sequence>
+         <xsd:element ref="ows:Metadata" minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:QName" use="required"/>
+   </xsd:complexType>
+
+   <!-- SCALAR CAPABILITIES -->
+   <xsd:complexType name="Scalar_CapabilitiesType">
+      <xsd:sequence>
+         <xsd:element ref="fes:LogicalOperators" minOccurs="0"/>
+         <xsd:element name="ComparisonOperators"
+                      type="fes:ComparisonOperatorsType" minOccurs="0"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:element name="LogicalOperators">
+      <xsd:complexType/>
+   </xsd:element>
+   <xsd:complexType name="ComparisonOperatorsType">
+      <xsd:sequence maxOccurs="unbounded">
+         <xsd:element name="ComparisonOperator"
+                      type="fes:ComparisonOperatorType"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="ComparisonOperatorType">
+      <xsd:attribute name="name"
+                     type="fes:ComparisonOperatorNameType" use="required"/>
+   </xsd:complexType>
+   <xsd:simpleType name="ComparisonOperatorNameType">
+      <xsd:union>
+         <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+               <xsd:enumeration value="PropertyIsEqualTo"/>
+               <xsd:enumeration value="PropertyIsNotEqualTo"/>
+               <xsd:enumeration value="PropertyIsLessThan"/>
+               <xsd:enumeration value="PropertyIsGreaterThan"/>
+               <xsd:enumeration value="PropertyIsLessThanOrEqualTo"/>
+               <xsd:enumeration value="PropertyIsGreaterThanOrEqualTo"/>
+               <xsd:enumeration value="PropertyIsLike"/>
+               <xsd:enumeration value="PropertyIsNull"/>
+               <xsd:enumeration value="PropertyIsNil"/>
+               <xsd:enumeration value="PropertyIsBetween"/>
+            </xsd:restriction>
+         </xsd:simpleType>
+         <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+               <xsd:pattern value="extension:\w{2,}"/>
+            </xsd:restriction>
+         </xsd:simpleType>
+      </xsd:union>
+   </xsd:simpleType>
+   <xsd:complexType name="AvailableFunctionsType">
+      <xsd:sequence>
+         <xsd:element name="Function"
+                      type="fes:AvailableFunctionType" maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="AvailableFunctionType">
+      <xsd:sequence>
+         <xsd:element ref="ows:Metadata" minOccurs="0"/>
+         <xsd:element name="Returns" type="xsd:QName"/>
+         <xsd:element name="Arguments"
+                      type="fes:ArgumentsType" minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
+   </xsd:complexType>
+   <xsd:complexType name="ArgumentsType">
+      <xsd:sequence>
+         <xsd:element name="Argument"
+                      type="fes:ArgumentType" maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="ArgumentType">
+      <xsd:sequence>
+         <xsd:element ref="ows:Metadata" minOccurs="0"/>
+         <xsd:element name="Type" type="xsd:QName"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
+   </xsd:complexType>
+
+   <!-- SPATIAL CAPABILITIES -->
+   <xsd:complexType name="Spatial_CapabilitiesType">
+      <xsd:sequence>
+         <xsd:element name="GeometryOperands"
+                      type="fes:GeometryOperandsType"/>
+         <xsd:element name="SpatialOperators"
+                      type="fes:SpatialOperatorsType"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="GeometryOperandsType">
+      <xsd:sequence>
+         <xsd:element name="GeometryOperand" maxOccurs="unbounded">
+            <xsd:complexType>
+               <xsd:attribute name="name" type="xsd:QName" use="required"/>
+            </xsd:complexType>
+         </xsd:element>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="SpatialOperatorsType">
+      <xsd:sequence>
+         <xsd:element name="SpatialOperator"
+                      type="fes:SpatialOperatorType"
+                      maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="SpatialOperatorType">
+      <xsd:sequence>
+         <xsd:element name="GeometryOperands"
+                      type="fes:GeometryOperandsType"
+                      minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="fes:SpatialOperatorNameType"/>
+   </xsd:complexType>
+   <xsd:simpleType name="SpatialOperatorNameType">
+      <xsd:union>
+         <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+               <xsd:enumeration value="BBOX"/>
+               <xsd:enumeration value="Equals"/>
+               <xsd:enumeration value="Disjoint"/>
+               <xsd:enumeration value="Intersects"/>
+               <xsd:enumeration value="Touches"/>
+               <xsd:enumeration value="Crosses"/>
+               <xsd:enumeration value="Within"/>
+               <xsd:enumeration value="Contains"/>
+               <xsd:enumeration value="Overlaps"/>
+               <xsd:enumeration value="Beyond"/>
+               <xsd:enumeration value="DWithin"/>
+            </xsd:restriction>
+         </xsd:simpleType>
+         <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+               <xsd:pattern value="extension:\w{2,}"/>
+            </xsd:restriction>
+         </xsd:simpleType>
+      </xsd:union>
+   </xsd:simpleType>
+
+   <!-- TEMPORAL CAPABILITIES -->
+   <xsd:complexType name="Temporal_CapabilitiesType">
+      <xsd:sequence>
+         <xsd:element name="TemporalOperands"
+                      type="fes:TemporalOperandsType"/>
+         <xsd:element name="TemporalOperators"
+                      type="fes:TemporalOperatorsType"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="TemporalOperandsType">
+      <xsd:sequence>
+         <xsd:element name="TemporalOperand" maxOccurs="unbounded">
+            <xsd:complexType>
+               <xsd:attribute name="name" type="xsd:QName" use="required"/>
+            </xsd:complexType>
+         </xsd:element>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="TemporalOperatorsType">
+      <xsd:sequence>
+         <xsd:element name="TemporalOperator"
+                      type="fes:TemporalOperatorType"
+                      maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="TemporalOperatorType">
+      <xsd:sequence>
+         <xsd:element name="TemporalOperands"
+                      type="fes:TemporalOperandsType"
+                      minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="name"
+                     type="fes:TemporalOperatorNameType" use="required"/>
+   </xsd:complexType>
+   <xsd:simpleType name="TemporalOperatorNameType">
+      <xsd:union>
+         <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+               <xsd:enumeration value="After"/>
+               <xsd:enumeration value="Before"/>
+               <xsd:enumeration value="Begins"/>
+               <xsd:enumeration value="BegunBy"/>
+               <xsd:enumeration value="TContains"/>
+               <xsd:enumeration value="During"/>
+               <xsd:enumeration value="TEquals"/>
+               <xsd:enumeration value="TOverlaps"/>
+               <xsd:enumeration value="Meets"/>
+               <xsd:enumeration value="OverlappedBy"/>
+               <xsd:enumeration value="MetBy"/>
+               <xsd:enumeration value="Ends"/>
+               <xsd:enumeration value="EndedBy"/>
+            </xsd:restriction>
+         </xsd:simpleType>
+         <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+               <xsd:pattern value="extension:\w{2,}"/>
+            </xsd:restriction>
+         </xsd:simpleType>
+      </xsd:union>
+   </xsd:simpleType>
+
+   <!-- EXTENSION CAPABILITIES -->
+   <xsd:complexType name="Extended_CapabilitiesType">
+      <xsd:sequence>
+         <xsd:element name="AdditionalOperators"
+                      type="fes:AdditionalOperatorsType" minOccurs="0"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="AdditionalOperatorsType">
+      <xsd:sequence>
+         <xsd:element name="Operator"
+                      type="fes:ExtensionOperatorType"
+                      minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType name="ExtensionOperatorType">
+      <xsd:attribute name="name" type="xsd:QName" use="required"/>
+   </xsd:complexType>
+
+</xsd:schema>
diff --git a/pycsw/core/schemas/ogc/filter/2.0/query.xsd b/pycsw/core/schemas/ogc/filter/2.0/query.xsd
new file mode 100644
index 0000000..b3be570
--- /dev/null
+++ b/pycsw/core/schemas/ogc/filter/2.0/query.xsd
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+   targetNamespace="http://www.opengis.net/fes/2.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   version="2.0.2">
+
+   <xsd:annotation>
+      <xsd:documentation>
+         Filter Encoding is an OGC Standard.
+         Copyright (c) 2010, 2014 Open Geospatial Consortium.
+         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+      </xsd:documentation>
+   </xsd:annotation>
+   
+   <xsd:include schemaLocation="filterAll.xsd"/>
+   
+   <xsd:element name="AbstractQueryExpression"
+                type="fes:AbstractQueryExpressionType" abstract="true"/>
+   <xsd:complexType name="AbstractQueryExpressionType" abstract="true">
+      <xsd:attribute name="handle" type="xsd:string"/>
+   </xsd:complexType>
+
+   <xsd:element name="AbstractAdhocQueryExpression"
+                type="fes:AbstractAdhocQueryExpressionType"
+                substitutionGroup="fes:AbstractQueryExpression"
+                abstract="true"/>
+   <xsd:complexType name="AbstractAdhocQueryExpressionType" abstract="true">
+      <xsd:complexContent>
+         <xsd:extension base="fes:AbstractQueryExpressionType">
+            <xsd:sequence>
+               <xsd:element ref="fes:AbstractProjectionClause"
+                            minOccurs="0" maxOccurs="unbounded"/>
+               <xsd:element ref="fes:AbstractSelectionClause" minOccurs="0"/>
+               <xsd:element ref="fes:AbstractSortingClause" minOccurs="0"/>
+            </xsd:sequence>
+            <xsd:attribute name="typeNames"
+                           type="fes:TypeNamesListType" use="required"/>
+            <xsd:attribute name="aliases"
+                           type="fes:AliasesType"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:simpleType name="TypeNamesListType">
+       <xsd:list itemType="fes:TypeNamesType"/>
+   </xsd:simpleType>
+   <xsd:simpleType name="TypeNamesType">
+       <xsd:union memberTypes="fes:SchemaElement xsd:QName"/>
+   </xsd:simpleType>
+   <xsd:simpleType name="SchemaElement">
+      <xsd:restriction base="xsd:string">
+         <xsd:pattern value="schema\-element\(.+\)"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+   <xsd:simpleType name="AliasesType">
+      <xsd:list itemType="xsd:NCName"/>
+   </xsd:simpleType>
+
+   <xsd:element name="AbstractProjectionClause" abstract="true"/>
+   <xsd:complexType name="AbstractProjectionClauseType" abstract="true"/>
+
+   <xsd:element name="AbstractSelectionClause" abstract="true"/>
+   <xsd:complexType name="AbstractSelectionClauseType" abstract="true"/>
+
+   <xsd:element name="AbstractSortingClause" abstract="true"/>
+   <xsd:complexType name="AbstractSortingClauseType" abstract="true"/>
+
+</xsd:schema>
diff --git a/pycsw/schemas/ogc/filter/1.1.0/sort.xsd b/pycsw/core/schemas/ogc/filter/2.0/sort.xsd
similarity index 54%
rename from pycsw/schemas/ogc/filter/1.1.0/sort.xsd
rename to pycsw/core/schemas/ogc/filter/2.0/sort.xsd
index 0890182..ced3aae 100644
--- a/pycsw/schemas/ogc/filter/1.1.0/sort.xsd
+++ b/pycsw/core/schemas/ogc/filter/2.0/sort.xsd
@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema
-   targetNamespace="http://www.opengis.net/ogc"
-   xmlns:ogc="http://www.opengis.net/ogc"
+   targetNamespace="http://www.opengis.net/fes/2.0"
+   xmlns:fes="http://www.opengis.net/fes/2.0"
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    elementFormDefault="qualified"
-   version="1.1.2">
-   <!-- 
-      filter is an OGC Standard.
-      Copyright (c) 2002,2003,2004,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-      To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-      
-      Updated: 2010-01-22
-   -->
+   version="2.0.2">
+
+   <xsd:annotation>
+      <xsd:documentation>
+         Filter Encoding is an OGC Standard.
+         Copyright (c) 2010, 2014 Open Geospatial Consortium.
+         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+      </xsd:documentation>
+   </xsd:annotation>
+
+   <xsd:include schemaLocation="filterAll.xsd"/>
+   <xsd:include schemaLocation="query.xsd"/>
    <xsd:include schemaLocation="expr.xsd"/>
 
    <!-- ============================================= -->
    <!-- SORTBY EXPRESSION                             -->
    <!-- ============================================= -->
-   <xsd:element name="SortBy" type="ogc:SortByType"/>
+   <xsd:element name="SortBy"
+                type="fes:SortByType"
+                substitutionGroup="fes:AbstractSortingClause"/>
 
    <!-- ============================================= -->
    <!-- COMPLEX TYPES                                 -->
@@ -25,16 +31,13 @@
    <xsd:complexType name="SortByType">
       <xsd:sequence>
          <xsd:element name="SortProperty"
-                      type="ogc:SortPropertyType"
-                      maxOccurs="unbounded"/>
+                      type="fes:SortPropertyType" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="SortPropertyType">
       <xsd:sequence>
-         <xsd:element ref="ogc:PropertyName"/>
-         <xsd:element name="SortOrder"
-                      type="ogc:SortOrderType"
-                      minOccurs="0"/>
+         <xsd:element ref="fes:ValueReference"/>
+         <xsd:element name="SortOrder" type="fes:SortOrderType" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
    <xsd:simpleType name="SortOrderType">
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/basicTypes.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/basicTypes.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/basicTypes.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/basicTypes.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/coordinateOperations.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/coordinateOperations.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/coordinateOperations.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/coordinateOperations.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/coordinateReferenceSystems.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/coordinateReferenceSystems.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/coordinateReferenceSystems.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/coordinateReferenceSystems.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/coordinateSystems.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/coordinateSystems.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/coordinateSystems.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/coordinateSystems.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/coverage.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/coverage.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/coverage.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/coverage.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/dataQuality.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/dataQuality.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/dataQuality.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/dataQuality.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/datums.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/datums.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/datums.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/datums.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd
similarity index 99%
copy from pycsw/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd
copy to pycsw/core/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd
index 08ecd8f..0648df5 100644
--- a/pycsw/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd
+++ b/pycsw/core/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd
@@ -14,7 +14,7 @@
        includes and imports
 	============================================================== -->
 	<include schemaLocation="measures.xsd"/>
-	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="http://schemas.opengis.net/gml/3.1.1/smil/smil20.xsd"/>
+	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="../smil/smil20.xsd"/>
 	<!-- ==============================================================
       the Style property
 	============================================================== -->
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/dictionary.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/dictionary.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/dictionary.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/dictionary.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/direction.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/direction.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/direction.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/direction.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/dynamicFeature.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/dynamicFeature.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/dynamicFeature.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/dynamicFeature.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/feature.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/feature.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/feature.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/feature.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/geometryAggregates.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/geometryAggregates.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/geometryAggregates.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/geometryAggregates.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/geometryBasic0d1d.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/geometryBasic0d1d.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/geometryBasic0d1d.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/geometryBasic0d1d.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/geometryBasic2d.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/geometryBasic2d.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/geometryBasic2d.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/geometryBasic2d.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/geometryComplexes.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/geometryComplexes.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/geometryComplexes.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/geometryComplexes.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/geometryPrimitives.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/geometryPrimitives.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/geometryPrimitives.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/geometryPrimitives.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/gml.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/gml.xsd
similarity index 100%
copy from pycsw/schemas/ogc/gml/3.1.1/base/gml.xsd
copy to pycsw/core/schemas/ogc/gml/3.1.1/base/gml.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/gmlBase.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/gmlBase.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/gmlBase.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/gmlBase.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/grids.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/grids.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/grids.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/grids.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/measures.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/measures.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/measures.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/measures.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/observation.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/observation.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/observation.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/observation.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/referenceSystems.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/referenceSystems.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/referenceSystems.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/referenceSystems.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/temporal.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/temporal.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/temporal.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/temporal.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/temporalReferenceSystems.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/temporalReferenceSystems.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/temporalReferenceSystems.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/temporalReferenceSystems.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/temporalTopology.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/temporalTopology.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/temporalTopology.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/temporalTopology.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/topology.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/topology.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/topology.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/topology.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/units.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/units.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/units.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/units.xsd
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/valueObjects.xsd b/pycsw/core/schemas/ogc/gml/3.1.1/base/valueObjects.xsd
similarity index 100%
rename from pycsw/schemas/ogc/gml/3.1.1/base/valueObjects.xsd
rename to pycsw/core/schemas/ogc/gml/3.1.1/base/valueObjects.xsd
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/SchematronConstraints.xml b/pycsw/core/schemas/ogc/gml/3.2.1/SchematronConstraints.xml
new file mode 100644
index 0000000..6cfd40f
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/SchematronConstraints.xml
@@ -0,0 +1,71 @@
+<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en">
+	<sch:title>Schematron constraints for GML / ISO 19136</sch:title>
+	<sch:ns prefix="sch" uri="http://purl.oclc.org/dsdl/schematron"/>
+	<sch:ns prefix="gml" uri="http://www.opengis.net/gml/3.2"/>
+	<sch:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
+	<sch:pattern>
+		<sch:rule context="gml:ValueArray">
+			<sch:assert test="not(@codeSpace and @uom)">ValueArray may not carry both a reference to a codeSpace and a uom</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:ValueArray">
+			<sch:assert test="count(gml:valueComponent/*) = count(gml:valueComponent/*[name() = name(../../gml:valueComponent[1]/*[1])])">All components shall be of the same type</sch:assert>
+			<sch:assert test="count(gml:valueComponents/*) = count(gml:valueComponents/*[name() = name(../*[1])])">All components shall be of the same type</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:pos">
+			<sch:assert test="not(@srsDimension) or @srsName">The presence of a dimension attribute implies the presence of the srsName attribute.</sch:assert>
+			<sch:assert test="not(@axisLabels) or @srsName">The presence of an axisLabels attribute implies the presence of the srsName attribute.</sch:assert>
+			<sch:assert test="not(@uomLabels) or @srsName">The presence of an uomLabels attribute implies the presence of the srsName attribute.</sch:assert>
+			<sch:assert test="(not(@uomLabels) and not(@axisLabels)) or (@uomLabels and @axisLabels)">The presence of an uomLabels attribute implies the presence of the axisLabels attribute and vice versa.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:PolyhedralSurface">
+			<sch:assert test="count(gml:patches/*)=count(gml:patches/gml:PolygonPatch)">All patches shall be gml:PolygonPatch elements or an element in the substitution group of gml:PolygonPatch. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:TriangulatedSurface">
+			<sch:assert test="count(gml:patches/*)=count(gml:patches/gml:Triangle)">All patches shall be gml:Triangle elements or an element in the substitution group of gml:PolygonPatch. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:abstractStrictAssociationRole">
+			<sch:assert test="not(@xlink:href and (*|text()))">Property element may not carry both a reference to an object and contain an object.</sch:assert>
+			<sch:assert test="@xlink:href | (*|text())">Property element shall either carry a reference to an object or contain an object.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:MultiPointDomain">
+			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiPoint)">All values in the domain set shall be gml:MultiPoint elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:MultiCurveDomain">
+			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiCurve)">All values in the domain set shall be gml:MultiCurve elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:MultiSurfaceDomain">
+			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiSurface)">All values in the domain set shall be gml:MultiSurface elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:MultiSolidDomain">
+			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiSolid)">All values in the domain set shall be gml:MultiSolid elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:GridDomain">
+			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:Grid)">All values in the domain set shall be gml:Grid elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+	<sch:pattern>
+		<sch:rule context="gml:RectifiedGridDomain">
+			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:RectifiedGrid)">All values in the domain set shall be gml:RectifiedGrid elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
+		</sch:rule>
+	</sch:pattern>
+</sch:schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/basicTypes.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/basicTypes.xsd
new file mode 100644
index 0000000..d6ffd5f
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/basicTypes.xsd
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:basicTypes:3.2.1">basicTypes.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 8.2.
+W3C XML Schema provides a set of built-in "simple" types which define methods for representing values as literals without internal markup.  These are described in W3C XML Schema Part 2:2001.  Because GML is an XML encoding in which instances are described using XML Schema, these simple types shall be used as far as possible and practical for the representation of data types.  W3C XML Schema also provides methods for defining 
+-	new simple types by restriction and combination of the built-in types, and 
+-	complex types, with simple content, but which also have XML attributes.  
+In many places where a suitable built-in simple type is not available, simple content types derived using the XML Schema mechanisms are used for the representation of data types in GML.  
+A set of these simple content types that are required by several GML components are defined in the basicTypes schema, as well as some elements based on them. These are primarily based around components needed to record amounts, counts, flags and terms, together with support for exceptions or null values.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<simpleType name="NilReasonType">
+		<annotation>
+			<documentation>gml:NilReasonType defines a content model that allows recording of an explanation for a void value or other exception.
+gml:NilReasonType is a union of the following enumerated values:
+-	inapplicable there is no value
+-	missing the correct value is not readily available to the sender of this data. Furthermore, a correct value may not exist
+-	template the value will be available later
+-	unknown the correct value is not known to, and not computable by, the sender of this data. However, a correct value probably exists
+-	withheld the value is not divulged
+-	other:text other brief explanation, where text is a string of two or more characters with no included spaces
+and
+-	anyURI which should refer to a resource which describes the reason for the exception
+A particular community may choose to assign more detailed semantics to the standard values provided. Alternatively, the URI method enables a specific or more complete explanation for the absence of a value to be provided elsewhere and indicated by-reference in an instance document.
+gml:NilReasonType is used as a member of a union in a number of simple content types where it is necessary to permit a value from the NilReasonType union as an alternative to the primary type.</documentation>
+		</annotation>
+		<union memberTypes="gml:NilReasonEnumeration anyURI"/>
+	</simpleType>
+	<simpleType name="NilReasonEnumeration">
+		<union>
+			<simpleType>
+				<restriction base="string">
+					<enumeration value="inapplicable"/>
+					<enumeration value="missing"/>
+					<enumeration value="template"/>
+					<enumeration value="unknown"/>
+					<enumeration value="withheld"/>
+				</restriction>
+			</simpleType>
+			<simpleType>
+				<restriction base="string">
+					<pattern value="other:\w{2,}"/>
+				</restriction>
+			</simpleType>
+		</union>
+	</simpleType>
+	<simpleType name="SignType">
+		<annotation>
+			<documentation>gml:SignType is a convenience type with values "+" (plus) and "-" (minus).</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="-"/>
+			<enumeration value="+"/>
+		</restriction>
+	</simpleType>
+	<simpleType name="booleanOrNilReason">
+		<annotation>
+			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
+		</annotation>
+		<union memberTypes="gml:NilReasonEnumeration boolean anyURI"/>
+	</simpleType>
+	<simpleType name="doubleOrNilReason">
+		<annotation>
+			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
+		</annotation>
+		<union memberTypes="gml:NilReasonEnumeration double anyURI"/>
+	</simpleType>
+	<simpleType name="integerOrNilReason">
+		<annotation>
+			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
+		</annotation>
+		<union memberTypes="gml:NilReasonEnumeration integer anyURI"/>
+	</simpleType>
+	<simpleType name="NameOrNilReason">
+		<annotation>
+			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
+		</annotation>
+		<union memberTypes="gml:NilReasonEnumeration Name anyURI"/>
+	</simpleType>
+	<simpleType name="stringOrNilReason">
+		<annotation>
+			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
+		</annotation>
+		<union memberTypes="gml:NilReasonEnumeration string anyURI"/>
+	</simpleType>
+	<complexType name="CodeType">
+		<annotation>
+			<documentation>gml:CodeType is a generalized type to be used for a term, keyword or name.
+It adds a XML attribute codeSpace to a term, where the value of the codeSpace attribute (if present) shall indicate a dictionary, thesaurus, classification scheme, authority, or pattern for the term.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="string">
+				<attribute name="codeSpace" type="anyURI"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<complexType name="CodeWithAuthorityType">
+		<annotation>
+			<documentation>gml:CodeWithAuthorityType requires that the codeSpace attribute is provided in an instance.</documentation>
+		</annotation>
+		<simpleContent>
+			<restriction base="gml:CodeType">
+				<attribute name="codeSpace" type="anyURI" use="required"/>
+			</restriction>
+		</simpleContent>
+	</complexType>
+	<complexType name="MeasureType">
+		<annotation>
+			<documentation>gml:MeasureType supports recording an amount encoded as a value of XML Schema double, together with a units of measure indicated by an attribute uom, short for "units Of measure". The value of the uom attribute identifies a reference system for the amount, usually a ratio or interval scale.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="double">
+				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<simpleType name="UomIdentifier">
+		<annotation>
+			<documentation>The simple type gml:UomIdentifer defines the syntax and value space of the unit of measure identifier.</documentation>
+		</annotation>
+		<union memberTypes="gml:UomSymbol gml:UomURI"/>
+	</simpleType>
+	<simpleType name="UomSymbol">
+		<annotation>
+			<documentation>This type specifies a character string of length at least one, and restricted such that it must not contain any of the following characters: ":" (colon), " " (space), (newline), (carriage return), (tab). This allows values corresponding to familiar abbreviations, such as "kg", "m/s", etc. 
+It is recommended that the symbol be an identifier for a unit of measure as specified in the "Unified Code of Units of Measure" (UCUM) (http://aurora.regenstrief.org/UCUM). This provides a set of symbols and a grammar for constructing identifiers for units of measure that are unique, and may be easily entered with a keyboard supporting the limited character set known as 7-bit ASCII. ISO 2955 formerly provided a specification with this scope, but was withdrawn in 2001. UCUM largely follow [...]
+		</annotation>
+		<restriction base="string">
+			<pattern value="[^: \n\r\t]+"/>
+		</restriction>
+	</simpleType>
+	<simpleType name="UomURI">
+		<annotation>
+			<documentation>This type specifies a URI, restricted such that it must start with one of the following sequences: "#", "./", "../", or a string of characters followed by a ":". These patterns ensure that the most common URI forms are supported, including absolute and relative URIs and URIs that are simple fragment identifiers, but prohibits certain forms of relative URI that could be mistaken for unit of measure symbol . 
+NOTE	It is possible to re-write such a relative URI to conform to the restriction (e.g. "./m/s").
+In an instance document, on elements of type gml:MeasureType the mandatory uom attribute shall carry a value corresponding to either 
+-	a conventional unit of measure symbol,
+-	a link to a definition of a unit of measure that does not have a conventional symbol, or when it is desired to indicate a precise or variant definition.</documentation>
+		</annotation>
+		<restriction base="anyURI">
+			<pattern value="([a-zA-Z][a-zA-Z0-9\-\+\.]*:|\.\./|\./|#).*"/>
+		</restriction>
+	</simpleType>
+	<complexType name="CoordinatesType">
+		<annotation>
+			<documentation>This type is deprecated for tuples with ordinate values that are numbers.
+CoordinatesType is a text string, intended to be used to record an array of tuples or coordinates. 
+While it is not possible to enforce the internal structure of the string through schema validation, some optional attributes have been provided in previous versions of GML to support a description of the internal structure. These attributes are deprecated. The attributes were intended to be used as follows:
+Decimal	symbol used for a decimal point (default="." a stop or period)
+cs        	symbol used to separate components within a tuple or coordinate string (default="," a comma)
+ts        	symbol used to separate tuples or coordinate strings (default=" " a space)
+Since it is based on the XML Schema string type, CoordinatesType may be used in the construction of tables of tuples or arrays of tuples, including ones that contain mixed text and numeric values.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="string">
+				<attribute name="decimal" type="string" default="."/>
+				<attribute name="cs" type="string" default=","/>
+				<attribute name="ts" type="string" default="&#x20;"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<simpleType name="booleanList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="boolean"/>
+	</simpleType>
+	<simpleType name="doubleList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="double"/>
+	</simpleType>
+	<simpleType name="integerList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="integer"/>
+	</simpleType>
+	<simpleType name="NameList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="Name"/>
+	</simpleType>
+	<simpleType name="NCNameList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="NCName"/>
+	</simpleType>
+	<simpleType name="QNameList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="QName"/>
+	</simpleType>
+	<simpleType name="booleanOrNilReasonList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="gml:booleanOrNilReason"/>
+	</simpleType>
+	<simpleType name="NameOrNilReasonList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="gml:NameOrNilReason"/>
+	</simpleType>
+	<simpleType name="doubleOrNilReasonList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="gml:doubleOrNilReason"/>
+	</simpleType>
+	<simpleType name="integerOrNilReasonList">
+		<annotation>
+			<documentation>A type for a list of values of the respective simple type.</documentation>
+		</annotation>
+		<list itemType="gml:integerOrNilReason"/>
+	</simpleType>
+	<complexType name="CodeListType">
+		<annotation>
+			<documentation>gml:CodeListType provides for lists of terms. The values in an instance element shall all be valid according to the rules of the dictionary, classification scheme, or authority identified by the value of its codeSpace attribute.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:NameList">
+				<attribute name="codeSpace" type="anyURI"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<complexType name="CodeOrNilReasonListType">
+		<annotation>
+			<documentation>gml:CodeOrNilReasonListType provides for lists of terms. The values in an instance element shall all be valid according to the rules of the dictionary, classification scheme, or authority identified by the value of its codeSpace attribute. An instance element may also include embedded values from NilReasonType. It is intended to be used in situations where a term or classification is expected, but the value may be absent for some reason.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:NameOrNilReasonList">
+				<attribute name="codeSpace" type="anyURI"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<complexType name="MeasureListType">
+		<annotation>
+			<documentation>gml:MeasureListType provides for a list of quantities.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:doubleList">
+				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<complexType name="MeasureOrNilReasonListType">
+		<annotation>
+			<documentation>gml:MeasureOrNilReasonListType provides for a list of quantities. An instance element may also include embedded values from NilReasonType. It is intended to be used in situations where a value is expected, but the value may be absent for some reason.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:doubleOrNilReasonList">
+				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/coordinateOperations.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/coordinateOperations.xsd
new file mode 100644
index 0000000..73b757b
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/coordinateOperations.xsd
@@ -0,0 +1,525 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns="http://www.w3.org/2001/XMLSchema" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateOperations:3.2.1">coordinateOperations.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 13.6.
+The spatial or temporal coordinate operations schema components can be divided into five logical parts, which define elements and types for XML encoding of the definitions of:
+-	Multiple abstract coordinate operations
+-	Multiple concrete types of coordinate operations, including Transformations and Conversions
+-	Abstract and concrete parameter values and groups
+-	Operation methods
+-	Abstract and concrete operation parameters and groups
+These schema component encodes the Coordinate Operation package of the UML Model for ISO 19111 Clause 11.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="referenceSystems.xsd"/>
+	<include schemaLocation="measures.xsd"/>
+	<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="../../../../../plugins/profiles/apiso/schemas/ogc/iso/19139/20070417/gmd/gmd.xsd"/>
+	<element name="AbstractCoordinateOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>gml:AbstractCoordinateOperation is a mathematical operation on coordinates that transforms or converts coordinates to another coordinate reference system. Many but not all coordinate operations (from CRS A to CRS B) also uniquely define the inverse operation (from CRS B to CRS A). In some cases, the operation method algorithm for the inverse operation is the same as for the forward algorithm, but the signs of some operation parameter values shall be reversed. In other c [...]
+The optional coordinateOperationAccuracy property elements provide estimates of the impact of this coordinate operation on point position accuracy.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractCoordinateOperationType" abstract="true">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:domainOfValidity" minOccurs="0"/>
+					<element ref="gml:scope" maxOccurs="unbounded"/>
+					<element ref="gml:operationVersion" minOccurs="0"/>
+					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:sourceCRS" minOccurs="0"/>
+					<element ref="gml:targetCRS" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="operationVersion" type="string">
+		<annotation>
+			<documentation>gml:operationVersion is the version of the coordinate transformation (i.e., instantiation due to the stochastic nature of the parameters). Mandatory when describing a transformation, and should not be supplied for a conversion.</documentation>
+		</annotation>
+	</element>
+	<element name="coordinateOperationAccuracy">
+		<annotation>
+			<documentation>gml:coordinateOperationAccuracy is an association role to a DQ_PositionalAccuracy object as encoded in ISO/TS 19139, either referencing or containing the definition of that positional accuracy. That object contains an estimate of the impact of this coordinate operation on point accuracy. That is, it gives position error estimates for the target coordinates of this coordinate operation, assuming no errors in the source coordinates.</documentation>
+		</annotation>
+		<complexType>
+			<sequence minOccurs="0">
+				<element ref="gmd:AbstractDQ_PositionalAccuracy"/>
+			</sequence>
+			<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		</complexType>
+	</element>
+	<element name="sourceCRS" type="gml:CRSPropertyType">
+		<annotation>
+			<documentation>gml:sourceCRS is an association role to the source CRS (coordinate reference system) of this coordinate operation.</documentation>
+		</annotation>
+	</element>
+	<element name="targetCRS" type="gml:CRSPropertyType">
+		<annotation>
+			<documentation>gml:targetCRS is an association role to the target CRS (coordinate reference system) of this coordinate operation.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CoordinateOperationPropertyType">
+		<annotation>
+			<documentation>gml:CoordinateOperationPropertyType is a property type for association roles to a coordinate operation, either referencing or containing the definition of that coordinate operation.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractCoordinateOperation"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AbstractSingleOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:AbstractCoordinateOperation">
+		<annotation>
+			<documentation>gml:AbstractSingleOperation is a single (not concatenated) coordinate operation.</documentation>
+		</annotation>
+	</element>
+	<complexType name="SingleOperationPropertyType">
+		<annotation>
+			<documentation>gml:SingleOperationPropertyType is a property type for association roles to a single operation, either referencing or containing the definition of that single operation.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractSingleOperation"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AbstractGeneralConversion" type="gml:AbstractGeneralConversionType" abstract="true" substitutionGroup="gml:AbstractOperation">
+		<annotation>
+			<documentation>gm:AbstractGeneralConversion is an abstract operation on coordinates that does not include any change of datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters. The operationVersion, sourceCRS, and targetCRS elements are omitted in a coordinate conversion.
+This abstract complex type is expected to be extended for well-known operation methods with many Conversion instances, in GML Application Schemas that define operation-method-specialized element names and contents. This conversion uses an operation method, usually with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to  [...]
+		</annotation>
+	</element>
+	<complexType name="AbstractGeneralConversionType" abstract="true">
+		<complexContent>
+			<restriction base="gml:AbstractCoordinateOperationType">
+				<sequence>
+					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:description" minOccurs="0"/>
+					<element ref="gml:descriptionReference" minOccurs="0"/>
+					<element ref="gml:identifier"/>
+					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:remarks" minOccurs="0"/>
+					<element ref="gml:domainOfValidity" minOccurs="0"/>
+					<element ref="gml:scope" maxOccurs="unbounded"/>
+					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute ref="gml:id" use="required"/>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<complexType name="GeneralConversionPropertyType">
+		<annotation>
+			<documentation>gml:GeneralConversionPropertyType is a property type for association roles to a general conversion, either referencing or containing the definition of that conversion.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractGeneralConversion"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AbstractGeneralTransformation" type="gml:AbstractGeneralTransformationType" abstract="true" substitutionGroup="gml:AbstractOperation">
+		<annotation>
+			<documentation>gml:AbstractGeneralTransformation is an abstract operation on coordinates that usually includes a change of Datum. The parameters of a coordinate transformation are empirically derived from data containing the coordinates of a series of points in both coordinate reference systems. This computational process is usually "over-determined", allowing derivation of error (or accuracy) estimates for the transformation. Also, the stochastic nature of the parameters may result i [...]
+This abstract complex type is expected to be extended for well-known operation methods with many Transformation instances, in Application Schemas that define operation-method-specialized value element names and contents. This transformation uses an operation method with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to [...]
+		</annotation>
+	</element>
+	<complexType name="AbstractGeneralTransformationType" abstract="true">
+		<complexContent>
+			<restriction base="gml:AbstractCoordinateOperationType">
+				<sequence>
+					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:description" minOccurs="0"/>
+					<element ref="gml:descriptionReference" minOccurs="0"/>
+					<element ref="gml:identifier"/>
+					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:remarks" minOccurs="0"/>
+					<element ref="gml:domainOfValidity" minOccurs="0"/>
+					<element ref="gml:scope" maxOccurs="unbounded"/>
+					<element ref="gml:operationVersion"/>
+					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:sourceCRS"/>
+					<element ref="gml:targetCRS"/>
+				</sequence>
+				<attribute ref="gml:id" use="required"/>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<complexType name="GeneralTransformationPropertyType">
+		<annotation>
+			<documentation>gml:GeneralTransformationPropertyType is a property type for association roles to a general transformation, either referencing or containing the definition of that transformation.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractGeneralTransformation"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="ConcatenatedOperation" type="gml:ConcatenatedOperationType" substitutionGroup="gml:AbstractCoordinateOperation"/>
+	<complexType name="ConcatenatedOperationType">
+		<annotation>
+			<documentation>gml:ConcatenatedOperation is an ordered sequence of two or more coordinate operations. This sequence of operations is constrained by the requirement that the source coordinate reference system of step (n+1) must be the same as the target coordinate reference system of step (n). The source coordinate reference system of the first step and the target coordinate reference system of the last step are the source and target coordinate reference system associated with the conc [...]
+The gml:coordOperation property elements are an ordered sequence of associations to the two or more operations used by this concatenated operation. The AggregationAttributeGroup should be used to specify that the coordOperation associations are ordered.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractCoordinateOperationType">
+				<sequence>
+					<element ref="gml:coordOperation" minOccurs="2" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="coordOperation" type="gml:CoordinateOperationPropertyType">
+		<annotation>
+			<documentation>gml:coordOperation is an association role to a coordinate operation.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ConcatenatedOperationPropertyType">
+		<annotation>
+			<documentation>gml:ConcatenatedOperationPropertyType is a property type for association roles to a concatenated operation, either referencing or containing the definition of that concatenated operation.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:ConcatenatedOperation"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="PassThroughOperation" type="gml:PassThroughOperationType" substitutionGroup="gml:AbstractSingleOperation">
+		<annotation>
+			<documentation>gml:PassThroughOperation is a pass-through operation specifies that a subset of a coordinate tuple is subject to a specific coordinate operation.
+The modifiedCoordinate property elements are an ordered sequence of positive integers defining the positions in a coordinate tuple of the coordinates affected by this pass-through operation. The AggregationAttributeGroup should be used to specify that the modifiedCoordinate elements are ordered.</documentation>
+		</annotation>
+	</element>
+	<complexType name="PassThroughOperationType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateOperationType">
+				<sequence>
+					<element ref="gml:modifiedCoordinate" maxOccurs="unbounded"/>
+					<element ref="gml:coordOperation"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="modifiedCoordinate" type="positiveInteger">
+		<annotation>
+			<documentation>gml:modifiedCoordinate is a positive integer defining a position in a coordinate tuple.</documentation>
+		</annotation>
+	</element>
+	<complexType name="PassThroughOperationPropertyType">
+		<annotation>
+			<documentation>gml:PassThroughOperationPropertyType is a property type for association roles to a pass through operation, either referencing or containing the definition of that pass through operation.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:PassThroughOperation"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="Conversion" type="gml:ConversionType" substitutionGroup="gml:AbstractGeneralConversion">
+		<annotation>
+			<documentation>gml:Conversion is a concrete operation on coordinates that does not include any change of Datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters.
+This concrete complex type can be used without using a GML Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Conversion instance.
+The usesValue property elements are an unordered list of composition associations to the set of parameter values used by this conversion operation.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ConversionType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralConversionType">
+				<sequence>
+					<element ref="gml:method"/>
+					<element ref="gml:parameterValue" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="method" type="gml:OperationMethodPropertyType">
+		<annotation>
+			<documentation>gml:method is an association role to the operation method used by a coordinate operation.</documentation>
+		</annotation>
+	</element>
+	<element name="parameterValue" type="gml:AbstractGeneralParameterValuePropertyType">
+		<annotation>
+			<documentation>gml:parameterValue is a composition association to a parameter value or group of parameter values used by a coordinate operation.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ConversionPropertyType">
+		<annotation>
+			<documentation>gml:ConversionPropertyType is a property type for association roles to a concrete general-purpose conversion, either referencing or containing the definition of that conversion.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:Conversion"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="Transformation" type="gml:TransformationType" substitutionGroup="gml:AbstractGeneralTransformation">
+		<annotation>
+			<documentation>gml:Transformation is a concrete object element derived from gml:GeneralTransformation (13.6.2.13).
+This concrete object can be used for all operation methods, without using a GML Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Transformation instance.
+The parameterValue elements are an unordered list of composition associations to the set of parameter values used by this conversion operation.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TransformationType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralTransformationType">
+				<sequence>
+					<element ref="gml:method"/>
+					<element ref="gml:parameterValue" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TransformationPropertyType">
+		<annotation>
+			<documentation>gml:TransformationPropertyType is a property type for association roles to a transformation, either referencing or containing the definition of that transformation.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:Transformation"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AbstractGeneralParameterValue" type="gml:AbstractGeneralParameterValueType" abstract="true" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>gml:AbstractGeneralParameterValue is an abstract parameter value or group of parameter values.
+This abstract complexType is expected to be extended and restricted for well-known operation methods with many instances, in Application Schemas that define operation-method-specialized element names and contents. Specific parameter value elements are directly contained in concrete subtypes, not in this abstract type. All concrete types derived from this type shall extend this type to include one "...Value" element with an appropriate type, which should be one of the element types allowe [...]
+		</annotation>
+	</element>
+	<complexType name="AbstractGeneralParameterValueType" abstract="true">
+		<sequence/>
+	</complexType>
+	<complexType name="AbstractGeneralParameterValuePropertyType">
+		<annotation>
+			<documentation>gml:AbstractGeneralParameterValuePropertyType is a  property type for inline association roles to a parameter value or group of parameter values, always containing the values.</documentation>
+		</annotation>
+		<sequence>
+			<element ref="gml:AbstractGeneralParameterValue"/>
+		</sequence>
+	</complexType>
+	<element name="ParameterValue" type="gml:ParameterValueType" substitutionGroup="gml:AbstractGeneralParameterValue">
+		<annotation>
+			<documentation>gml:ParameterValue is a parameter value, an ordered sequence of values, or a reference to a file of parameter values. This concrete complex type may be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one instance. This complex type may be used, extended, or restricted for well-known operation methods, especially for methods with many instances.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ParameterValueType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralParameterValueType">
+				<sequence>
+					<choice>
+						<element ref="gml:value"/>
+						<element ref="gml:dmsAngleValue"/>
+						<element ref="gml:stringValue"/>
+						<element ref="gml:integerValue"/>
+						<element ref="gml:booleanValue"/>
+						<element ref="gml:valueList"/>
+						<element ref="gml:integerValueList"/>
+						<element ref="gml:valueFile"/>
+					</choice>
+					<element ref="gml:operationParameter"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="value" type="gml:MeasureType">
+		<annotation>
+			<documentation>gml:value is a numeric value of an operation parameter, with its associated unit of measure.</documentation>
+		</annotation>
+	</element>
+	<element name="stringValue" type="string">
+		<annotation>
+			<documentation>gml:stringValue is a character string value of an operation parameter. A string value does not have an associated unit of measure.</documentation>
+		</annotation>
+	</element>
+	<element name="integerValue" type="positiveInteger">
+		<annotation>
+			<documentation>gml:integerValue is a positive integer value of an operation parameter, usually used for a count. An integer value does not have an associated unit of measure.</documentation>
+		</annotation>
+	</element>
+	<element name="booleanValue" type="boolean">
+		<annotation>
+			<documentation>gml:booleanValue is a boolean value of an operation parameter. A Boolean value does not have an associated unit of measure.</documentation>
+		</annotation>
+	</element>
+	<element name="valueList" type="gml:MeasureListType">
+		<annotation>
+			<documentation>gml:valueList is an ordered sequence of two or more numeric values of an operation parameter list, where each value has the same associated unit of measure. An element of this type contains a space-separated sequence of double values.</documentation>
+		</annotation>
+	</element>
+	<element name="integerValueList" type="gml:integerList">
+		<annotation>
+			<documentation>gml:integerValueList is an ordered sequence of two or more integer values of an operation parameter list, usually used for counts. These integer values do not have an associated unit of measure. An element of this type contains a space-separated sequence of integer values.</documentation>
+		</annotation>
+	</element>
+	<element name="valueFile" type="anyURI">
+		<annotation>
+			<documentation>gml:valueFile is a reference to a file or a part of a file containing one or more parameter values, each numeric value with its associated unit of measure. When referencing a part of a file, that file shall contain multiple identified parts, such as an XML encoded document. Furthermore, the referenced file or part of a file may reference another part of the same or different files, as allowed in XML documents.</documentation>
+		</annotation>
+	</element>
+	<element name="operationParameter" type="gml:OperationParameterPropertyType">
+		<annotation>
+			<documentation>gml:operationParameter is an association role to the operation parameter of which this is a value.</documentation>
+		</annotation>
+	</element>
+	<element name="ParameterValueGroup" type="gml:ParameterValueGroupType" substitutionGroup="gml:AbstractGeneralParameterValue">
+		<annotation>
+			<documentation>gml:ParameterValueGroup is a group of related parameter values. The same group can be repeated more than once in a Conversion, Transformation, or higher level ParameterValueGroup, if those instances contain different values of one or more parameterValues which suitably distinquish among those groups. This concrete complex type can be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents. This  [...]
+The parameterValue elements are an unordered set of composition association roles to the parameter values and groups of values included in this group.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ParameterValueGroupType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralParameterValueType">
+				<sequence>
+					<element ref="gml:parameterValue" minOccurs="2" maxOccurs="unbounded"/>
+					<element ref="gml:group"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="group" type="gml:OperationParameterGroupPropertyType">
+		<annotation>
+			<documentation>gml:group is an association role to the operation parameter group for which this element provides parameter values.</documentation>
+		</annotation>
+	</element>
+	<element name="OperationMethod" type="gml:OperationMethodType" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>gml:OperationMethod is a method (algorithm or procedure) used to perform a coordinate operation. Most operation methods use a number of operation parameters, although some coordinate conversions use none. Each coordinate operation using the method assigns values to these parameters.
+The parameter elements are an unordered list of associations to the set of operation parameters and parameter groups used by this operation method.</documentation>
+		</annotation>
+	</element>
+	<complexType name="OperationMethodType">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<choice>
+						<element ref="gml:formulaCitation"/>
+						<element ref="gml:formula"/>
+					</choice>
+					<element ref="gml:sourceDimensions" minOccurs="0"/>
+					<element ref="gml:targetDimensions" minOccurs="0"/>
+					<element ref="gml:parameter" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="formulaCitation">
+		<annotation>
+			<documentation>gml:formulaCitation provides a reference to a publication giving the formula(s) or procedure used by an coordinate operation method.</documentation>
+		</annotation>
+		<complexType>
+			<sequence minOccurs="0">
+				<element ref="gmd:CI_Citation"/>
+			</sequence>
+			<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		</complexType>
+	</element>
+	<element name="formula" type="gml:CodeType">
+		<annotation>
+			<documentation>gml:formula Formula(s) or procedure used by an operation method. The use of the codespace attribite has been deprecated. The property value shall be a character string.</documentation>
+		</annotation>
+	</element>
+	<element name="sourceDimensions" type="positiveInteger">
+		<annotation>
+			<documentation>gml:sourceDimensions is the number of dimensions in the source CRS of this operation method.</documentation>
+		</annotation>
+	</element>
+	<element name="targetDimensions" type="positiveInteger">
+		<annotation>
+			<documentation>gml:targetDimensions is the number of dimensions in the target CRS of this operation method.</documentation>
+		</annotation>
+	</element>
+	<element name="parameter" type="gml:AbstractGeneralOperationParameterPropertyType">
+		<annotation>
+			<documentation>gml:parameter is an association to an operation parameter or parameter group.</documentation>
+		</annotation>
+	</element>
+	<complexType name="OperationMethodPropertyType">
+		<annotation>
+			<documentation>gml:OperationMethodPropertyType is a property type for association roles to a concrete general-purpose operation method, either referencing or containing the definition of that method.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:OperationMethod"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AbstractGeneralOperationParameter" type="gml:AbstractGeneralOperationParameterType" abstract="true" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>gml:GeneralOperationParameter is the abstract definition of a parameter or group of parameters used by an operation method.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractGeneralOperationParameterType" abstract="true">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:minimumOccurs" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="minimumOccurs" type="nonNegativeInteger">
+		<annotation>
+			<documentation>gml:minimumOccurs is the minimum number of times that values for this parameter group or parameter are required. If this attribute is omitted, the minimum number shall be one.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractGeneralOperationParameterPropertyType">
+		<annotation>
+			<documentation>gml:AbstractGeneralOperationParameterPropertyType is a property type for association roles to an operation parameter or group, either referencing or containing the definition of that parameter or group.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractGeneralOperationParameter"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="OperationParameter" type="gml:OperationParameterType" substitutionGroup="gml:AbstractGeneralOperationParameter">
+		<annotation>
+			<documentation>gml:OperationParameter is the definition of a parameter used by an operation method. Most parameter values are numeric, but other types of parameter values are possible. This complex type is expected to be used or extended for all operation methods, without defining operation-method-specialized element names.</documentation>
+		</annotation>
+	</element>
+	<complexType name="OperationParameterType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralOperationParameterType">
+				<sequence/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="OperationParameterPropertyType">
+		<annotation>
+			<documentation>gml:OperationParameterPropertyType is a property type for association roles to an operation parameter, either referencing or containing the definition of that parameter.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:OperationParameter"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="OperationParameterGroup" type="gml:OperationParameterGroupType" substitutionGroup="gml:AbstractGeneralOperationParameter">
+		<annotation>
+			<documentation>gml:OperationParameterGroup is the definition of a group of parameters used by an operation method. This complex type is expected to be used or extended for all applicable operation methods, without defining operation-method-specialized element names.
+The generalOperationParameter elements are an unordered list of associations to the set of operation parameters that are members of this group.</documentation>
+		</annotation>
+	</element>
+	<complexType name="OperationParameterGroupType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralOperationParameterType">
+				<sequence>
+					<element ref="gml:maximumOccurs" minOccurs="0"/>
+					<element ref="gml:parameter" minOccurs="2" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="maximumOccurs" type="positiveInteger">
+		<annotation>
+			<documentation>gml:maximumOccurs is the maximum number of times that values for this parameter group may be included. If this attribute is omitted, the maximum number shall be one.</documentation>
+		</annotation>
+	</element>
+	<complexType name="OperationParameterGroupPropertyType">
+		<annotation>
+			<documentation>gml:OperationParameterPropertyType is a property type for association roles to an operation parameter group, either referencing or containing the definition of that parameter group.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:OperationParameterGroup"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/coordinateReferenceSystems.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/coordinateReferenceSystems.xsd
new file mode 100644
index 0000000..72a6ced
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/coordinateReferenceSystems.xsd
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateReferenceSystems:3.2.1">coordinateReferenceSystems.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 13.3.
+The spatial-temporal coordinate reference systems schema components are divided into two logical parts. One part defines elements and types for XML encoding of abstract coordinate reference systems definitions. The larger part defines specialized constructs for XML encoding of definitions of the multiple concrete types of spatial-temporal coordinate reference systems.
+These schema components encode the Coordinate Reference System packages of the UML Models of ISO 19111 Clause 8 and ISO/DIS 19136 D.3.10, with the exception of the abstract "SC_CRS" class.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="coordinateSystems.xsd"/>
+	<include schemaLocation="datums.xsd"/>
+	<include schemaLocation="coordinateOperations.xsd"/>
+	<element name="AbstractSingleCRS" type="gml:AbstractCRSType" abstract="true" substitutionGroup="gml:AbstractCRS">
+		<annotation>
+			<documentation>gml:AbstractSingleCRS implements a coordinate reference system consisting of one coordinate system and one datum (as opposed to a Compound CRS).</documentation>
+		</annotation>
+	</element>
+	<complexType name="SingleCRSPropertyType">
+		<annotation>
+			<documentation>gml:SingleCRSPropertyType is a property type for association roles to a single coordinate reference system, either referencing or containing the definition of that coordinate reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractSingleCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AbstractGeneralDerivedCRS" type="gml:AbstractGeneralDerivedCRSType" abstract="true" substitutionGroup="gml:AbstractSingleCRS">
+		<annotation>
+			<documentation>gml:AbstractGeneralDerivedCRS is a coordinate reference system that is defined by its coordinate conversion from another coordinate reference system. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractGeneralDerivedCRSType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<element ref="gml:conversion"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="conversion" type="gml:GeneralConversionPropertyType">
+		<annotation>
+			<documentation>gml:conversion is an association role to the coordinate conversion used to define the derived CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="CompoundCRS" type="gml:CompoundCRSType" substitutionGroup="gml:AbstractCRS">
+		<annotation>
+			<documentation>gml:CompundCRS is a coordinate reference system describing the position of points through two or more independent coordinate reference systems. It is associated with a non-repeating sequence of two or more instances of SingleCRS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CompoundCRSType">
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<element ref="gml:componentReferenceSystem" minOccurs="2" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="componentReferenceSystem" type="gml:SingleCRSPropertyType">
+		<annotation>
+			<documentation>The gml:componentReferenceSystem elements are an ordered sequence of associations to all the component coordinate reference systems included in this compound coordinate reference system. The gml:AggregationAttributeGroup should be used to specify that the gml:componentReferenceSystem properties are ordered.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CompoundCRSPropertyType">
+		<annotation>
+			<documentation>gml:CompoundCRSPropertyType is a property type for association roles to a compound coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:CompoundCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="GeodeticCRS" type="gml:GeodeticCRSType" substitutionGroup="gml:AbstractSingleCRS"/>
+	<complexType name="GeodeticCRSType">
+		<annotation>
+			<documentation>gml:GeodeticCRS is a coordinate reference system based on a geodetic datum.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<choice>
+						<element ref="gml:ellipsoidalCS"/>
+						<element ref="gml:cartesianCS"/>
+						<element ref="gml:sphericalCS"/>
+					</choice>
+					<element ref="gml:geodeticDatum"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="ellipsoidalCS" type="gml:EllipsoidalCSPropertyType">
+		<annotation>
+			<documentation>gml:ellipsoidalCS is an association role to the ellipsoidal coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="cartesianCS" type="gml:CartesianCSPropertyType">
+		<annotation>
+			<documentation>gml:cartesianCS is an association role to the Cartesian coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="sphericalCS" type="gml:SphericalCSPropertyType">
+		<annotation>
+			<documentation>gml:sphericalCS is an association role to the spherical coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="geodeticDatum" type="gml:GeodeticDatumPropertyType">
+		<annotation>
+			<documentation>gml:geodeticDatum is an association role to the geodetic datum used by this CRS.
+</documentation>
+		</annotation>
+	</element>
+	<complexType name="GeodeticCRSPropertyType">
+		<annotation>
+			<documentation>gml:GeodeticCRSPropertyType is a property type for association roles to a geodetic coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:GeodeticCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="VerticalCRS" type="gml:VerticalCRSType" substitutionGroup="gml:AbstractSingleCRS">
+		<annotation>
+			<documentation>gml:VerticalCRS is a 1D coordinate reference system used for recording heights or depths. Vertical CRSs make use of the direction of gravity to define the concept of height or depth, but the relationship with gravity may not be straightforward. By implication, ellipsoidal heights (h) cannot be captured in a vertical coordinate reference system. Ellipsoidal heights cannot exist independently, but only as an inseparable part of a 3D coordinate tuple defined in a geographi [...]
+		</annotation>
+	</element>
+	<complexType name="VerticalCRSType">
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<element ref="gml:verticalCS"/>
+					<element ref="gml:verticalDatum"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="verticalCS" type="gml:VerticalCSPropertyType">
+		<annotation>
+			<documentation>gml:verticalCS is an association role to the vertical coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="verticalDatum" type="gml:VerticalDatumPropertyType">
+		<annotation>
+			<documentation>gml:verticalDatum is an association role to the vertical datum used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="VerticalCRSPropertyType">
+		<annotation>
+			<documentation>gml:VerticalCRSPropertyType is a property type for association roles to a vertical coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:VerticalCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="ProjectedCRS" type="gml:ProjectedCRSType" substitutionGroup="gml:AbstractGeneralDerivedCRS">
+		<annotation>
+			<documentation>gml:ProjectedCRS is a 2D coordinate reference system used to approximate the shape of the earth on a planar surface, but in such a way that the distortion that is inherent to the approximation is carefully controlled and known. Distortion correction is commonly applied to calculated bearings and distances to produce values that are a close match to actual field values.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ProjectedCRSType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralDerivedCRSType">
+				<sequence>
+					<choice>
+						<element ref="gml:baseGeodeticCRS"/>
+						<element ref="gml:baseGeographicCRS"/>
+					</choice>
+					<element ref="gml:cartesianCS"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="baseGeodeticCRS" type="gml:GeodeticCRSPropertyType">
+		<annotation>
+			<documentation>gml:baseGeodeticCRS is an association role to the geodetic coordinate reference system used by this projected CRS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ProjectedCRSPropertyType">
+		<annotation>
+			<documentation>gml:ProjectedCRSPropertyType is a property type for association roles to a projected coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:ProjectedCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="DerivedCRS" type="gml:DerivedCRSType" substitutionGroup="gml:AbstractGeneralDerivedCRS">
+		<annotation>
+			<documentation>gml:DerivedCRS is a single coordinate reference system that is defined by its coordinate conversion from another single coordinate reference system known as the base CRS. The base CRS can be a projected coordinate reference system, if this DerivedCRS is used for a georectified grid coverage as described in ISO 19123, Clause 8.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DerivedCRSType">
+		<complexContent>
+			<extension base="gml:AbstractGeneralDerivedCRSType">
+				<sequence>
+					<element ref="gml:baseCRS"/>
+					<element ref="gml:derivedCRSType"/>
+					<element ref="gml:coordinateSystem"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="baseCRS" type="gml:SingleCRSPropertyType">
+		<annotation>
+			<documentation>gml:baseCRS is an association role to the coordinate reference system used by this derived CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="derivedCRSType" type="gml:CodeWithAuthorityType">
+		<annotation>
+			<documentation>The gml:derivedCRSType property describes the type of a derived coordinate reference system. The required codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
+		</annotation>
+	</element>
+	<element name="coordinateSystem" type="gml:CoordinateSystemPropertyType">
+		<annotation>
+			<documentation>An association role to the coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DerivedCRSPropertyType">
+		<annotation>
+			<documentation>gml:DerivedCRSPropertyType is a property type for association roles to a non-projected derived coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:DerivedCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="EngineeringCRS" type="gml:EngineeringCRSType" substitutionGroup="gml:AbstractSingleCRS">
+		<annotation>
+			<documentation>gml:EngineeringCRS is a contextually local coordinate reference system which can be divided into two broad categories:
+-	earth-fixed systems applied to engineering activities on or near the surface of the earth;
+-	CRSs on moving platforms such as road vehicles, vessels, aircraft, or spacecraft, see ISO 19111 8.3.</documentation>
+		</annotation>
+	</element>
+	<complexType name="EngineeringCRSType">
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<choice>
+						<element ref="gml:affineCS"/>
+						<element ref="gml:cartesianCS"/>
+						<element ref="gml:cylindricalCS"/>
+						<element ref="gml:linearCS"/>
+						<element ref="gml:polarCS"/>
+						<element ref="gml:sphericalCS"/>
+						<element ref="gml:userDefinedCS"/>
+						<element ref="gml:coordinateSystem">
+							<annotation>
+								<appinfo>deprecated</appinfo>
+							</annotation>
+						</element>
+					</choice>
+					<element ref="gml:engineeringDatum"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="cylindricalCS" type="gml:CylindricalCSPropertyType">
+		<annotation>
+			<documentation>gml:cylindricalCS is an association role to the cylindrical coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="linearCS" type="gml:LinearCSPropertyType">
+		<annotation>
+			<documentation>gml:linearCS is an association role to the linear coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="polarCS" type="gml:PolarCSPropertyType">
+		<annotation>
+			<documentation>gml:polarCS is an association role to the polar coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="userDefinedCS" type="gml:UserDefinedCSPropertyType">
+		<annotation>
+			<documentation>gml:userDefinedCS is an association role to the user defined coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="engineeringDatum" type="gml:EngineeringDatumPropertyType">
+		<annotation>
+			<documentation>gml:engineeringDatum is an association role to the engineering datum used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="EngineeringCRSPropertyType">
+		<annotation>
+			<documentation>gml:EngineeringCRSPropertyType is a property type for association roles to an engineering coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:EngineeringCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="ImageCRS" type="gml:ImageCRSType" substitutionGroup="gml:AbstractSingleCRS">
+		<annotation>
+			<documentation>gml:ImageCRS is an engineering coordinate reference system applied to locations in images. Image coordinate reference systems are treated as a separate sub-type because the definition of the associated image datum contains two attributes not relevant to other engineering datums.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ImageCRSType">
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<choice>
+						<element ref="gml:cartesianCS"/>
+						<element ref="gml:affineCS"/>
+						<element ref="gml:usesObliqueCartesianCS"/>
+					</choice>
+					<element ref="gml:imageDatum"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="affineCS" type="gml:AffineCSPropertyType">
+		<annotation>
+			<documentation>gml:affineCS is an association role to the affine coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="imageDatum" type="gml:ImageDatumPropertyType">
+		<annotation>
+			<documentation>gml:imageDatum is an association role to the image datum used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ImageCRSPropertyType">
+		<annotation>
+			<documentation>gml:ImageCRSPropertyType is a property type for association roles to an image coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:ImageCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="TemporalCRS" type="gml:TemporalCRSType" substitutionGroup="gml:AbstractSingleCRS">
+		<annotation>
+			<documentation>gml:TemporalCRS is a 1D coordinate reference system used for the recording of time.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TemporalCRSType">
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<choice>
+						<element ref="gml:timeCS"/>
+						<element ref="gml:usesTemporalCS"/>
+					</choice>
+					<element ref="gml:temporalDatum"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="timeCS" type="gml:TimeCSPropertyType">
+		<annotation>
+			<documentation>gml:timeCS is an association role to the time coordinate system used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<element name="temporalDatum" type="gml:TemporalDatumPropertyType">
+		<annotation>
+			<documentation>gml:temporalDatum is an association role to the temporal datum used by this CRS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TemporalCRSPropertyType">
+		<annotation>
+			<documentation>gml:TemporalCRSPropertyType is a property type for association roles to a temporal coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TemporalCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/coordinateSystems.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/coordinateSystems.xsd
new file mode 100644
index 0000000..37627f2
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/coordinateSystems.xsd
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en"  version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateSystems:3.2.1">coordinateSystems.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 13.4.
+The coordinate systems schema components can be divded into  three logical parts, which define elements and types for XML encoding of the definitions of:
+-	Coordinate system axes
+-	Abstract coordinate system
+-	Multiple concrete types of spatial-temporal coordinate systems
+These schema components encode the Coordinate System packages of the UML Models of ISO 19111 Clause 9 and ISO/DIS 19136 D.3.10.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="referenceSystems.xsd"/>
+	<element name="CoordinateSystemAxis" type="gml:CoordinateSystemAxisType" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>gml:CoordinateSystemAxis is a definition of a coordinate system axis.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CoordinateSystemAxisType">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:axisAbbrev"/>
+					<element ref="gml:axisDirection"/>
+					<element ref="gml:minimumValue" minOccurs="0"/>
+					<element ref="gml:maximumValue" minOccurs="0"/>
+					<element ref="gml:rangeMeaning" minOccurs="0"/>
+				</sequence>
+				<attribute name="uom" type="gml:UomIdentifier" use="required">
+					<annotation>
+						<documentation>The uom attribute provides an identifier of the unit of measure used for this coordinate system axis. The value of this coordinate in a coordinate tuple shall be recorded using this unit of measure, whenever those coordinates use a coordinate reference system that uses a coordinate system that uses this axis.</documentation>
+					</annotation>
+				</attribute>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="axisAbbrev" type="gml:CodeType">
+		<annotation>
+			<documentation>gml:axisAbbrev is the abbreviation used for this coordinate system axis; this abbreviation is also used to identify the coordinates in the coordinate tuple. The codeSpace attribute may reference a source of more information on a set of standardized abbreviations, or on this abbreviation.</documentation>
+		</annotation>
+	</element>
+	<element name="axisDirection" type="gml:CodeWithAuthorityType">
+		<annotation>
+			<documentation>gml:axisDirection is the direction of this coordinate system axis (or in the case of Cartesian projected coordinates, the direction of this coordinate system axis at the origin).
+Within any set of coordinate system axes, only one of each pair of terms may be used. For earth-fixed CRSs, this direction is often approximate and intended to provide a human interpretable meaning to the axis. When a geodetic datum is used, the precise directions of the axes may therefore vary slightly from this approximate direction.
+The codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
+		</annotation>
+	</element>
+	<element name="minimumValue" type="double">
+		<annotation>
+			<documentation>The gml:minimumValue and gml:maximumValue properties allow the specification of minimum and maximum value normally allowed for this axis, in the unit of measure for the axis. For a continuous angular axis such as longitude, the values wrap-around at this value. Also, values beyond this minimum/maximum can be used for specified purposes, such as in a bounding box. A value of minus infinity shall be allowed for the gml:minimumValue element, a value of plus infiniy for the [...]
+		</annotation>
+	</element>
+	<element name="maximumValue" type="double">
+		<annotation>
+			<documentation>The gml:minimumValue and gml:maximumValue properties allow the specification of minimum and maximum value normally allowed for this axis, in the unit of measure for the axis. For a continuous angular axis such as longitude, the values wrap-around at this value. Also, values beyond this minimum/maximum can be used for specified purposes, such as in a bounding box. A value of minus infinity shall be allowed for the gml:minimumValue element, a value of plus infiniy for the [...]
+		</annotation>
+	</element>
+	<element name="rangeMeaning" type="gml:CodeWithAuthorityType">
+		<annotation>
+			<documentation>gml:rangeMeaning describes the meaning of axis value range specified by gml:minimumValue and gml:maximumValue. This element shall be omitted when both gml:minimumValue and gml:maximumValue are omitted. This element should be included when gml:minimumValue and/or gml:maximumValue are included. If this element is omitted when the gml:minimumValue and/or gml:maximumValue are included, the meaning is unspecified. The codeSpace attribute shall reference a source of informati [...]
+		</annotation>
+	</element>
+	<complexType name="CoordinateSystemAxisPropertyType">
+		<annotation>
+			<documentation>gml:CoordinateSystemAxisPropertyType is a property type for association roles to a coordinate system axis, either referencing or containing the definition of that axis.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:CoordinateSystemAxis"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AbstractCoordinateSystem" type="gml:AbstractCoordinateSystemType" abstract="true" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>gml:AbstractCoordinateSystem is a coordinate system (CS) is the non-repeating sequence of coordinate system axes that spans a given coordinate space. A CS is derived from a set of mathematical rules for specifying how coordinates in a given space are to be assigned to points. The coordinate values in a coordinate tuple shall be recorded in the order in which the coordinate system axes associations are recorded. This abstract complex type shall not be used, extended, or  [...]
+		</annotation>
+	</element>
+	<complexType name="AbstractCoordinateSystemType" abstract="true">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:axis" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="axis" type="gml:CoordinateSystemAxisPropertyType">
+		<annotation>
+			<documentation>The gml:axis property is an association role (ordered sequence) to the coordinate system axes included in this coordinate system. The coordinate values in a coordinate tuple shall be recorded in the order in which the coordinate system axes associations are recorded, whenever those coordinates use a coordinate reference system that uses this coordinate system. The gml:AggregationAttributeGroup should be used to specify that the axis objects are ordered.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CoordinateSystemPropertyType">
+		<annotation>
+			<documentation>gml:CoordinateSystemPropertyType is a property type for association roles to a coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractCoordinateSystem"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="EllipsoidalCS" type="gml:EllipsoidalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:EllipsoidalCS is a two- or three-dimensional coordinate system in which position is specified by geodetic latitude, geodetic longitude, and (in the three-dimensional case) ellipsoidal height. An EllipsoidalCS shall have two or three gml:axis property elements; the number of associations shall equal the dimension of the CS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="EllipsoidalCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="EllipsoidalCSPropertyType">
+		<annotation>
+			<documentation>gml:EllipsoidalCSPropertyType is a property type for association roles to an ellipsoidal coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:EllipsoidalCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="CartesianCS" type="gml:CartesianCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:CartesianCS is a 1-, 2-, or 3-dimensional coordinate system. In the 1-dimensional case, it contains a single straight coordinate axis. In the 2- and 3-dimensional cases gives the position of points relative to orthogonal straight axes. In the multi-dimensional case, all axes shall have the same length unit of measure. A CartesianCS shall have one, two, or three gml:axis property elements.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CartesianCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="CartesianCSPropertyType">
+		<annotation>
+			<documentation>gml:CartesianCSPropertyType is a property type for association roles to a Cartesian coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:CartesianCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="VerticalCS" type="gml:VerticalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:VerticalCS is a one-dimensional coordinate system used to record the heights or depths of points. Such a coordinate system is usually dependent on the Earth's gravity field, perhaps loosely as when atmospheric pressure is the basis for the vertical coordinate system axis. A VerticalCS shall have one gml:axis property element.</documentation>
+		</annotation>
+	</element>
+	<complexType name="VerticalCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="VerticalCSPropertyType">
+		<annotation>
+			<documentation>gml:VerticalCSPropertyType is a property type for association roles to a vertical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:VerticalCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="TimeCS" type="gml:TimeCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:TimeCS is a one-dimensional coordinate system containing a time axis, used to describe the temporal position of a point in the specified time units from a specified time origin. A TimeCS shall have one gml:axis property element.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeCSPropertyType">
+		<annotation>
+			<documentation>gml:TimeCSPropertyType is a property type for association roles to a time coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="LinearCS" type="gml:LinearCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:LinearCS is a one-dimensional coordinate system that consists of the points that lie on the single axis described. The associated coordinate is the distance – with or without offset – from the specified datum to the point along the axis. A LinearCS shall have one gml:axis property element.</documentation>
+		</annotation>
+	</element>
+	<complexType name="LinearCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="LinearCSPropertyType">
+		<annotation>
+			<documentation>gml:LinearCSPropertyType is a property type for association roles to a linear coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:LinearCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="UserDefinedCS" type="gml:UserDefinedCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:UserDefinedCS is a two- or three-dimensional coordinate system that consists of any combination of coordinate axes not covered by any other coordinate system type. A UserDefinedCS shall have two or three gml:axis property elements; the number of property elements shall equal the dimension of the CS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="UserDefinedCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="UserDefinedCSPropertyType">
+		<annotation>
+			<documentation>gml:UserDefinedCSPropertyType is a property type for association roles to a user-defined coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:UserDefinedCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="SphericalCS" type="gml:SphericalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:SphericalCS is a three-dimensional coordinate system with one distance measured from the origin and two angular coordinates. A SphericalCS shall have three gml:axis property elements.</documentation>
+		</annotation>
+	</element>
+	<complexType name="SphericalCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="SphericalCSPropertyType">
+		<annotation>
+			<documentation>gml:SphericalCSPropertyType is property type for association roles to a spherical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:SphericalCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="PolarCS" type="gml:PolarCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:PolarCS ia s two-dimensional coordinate system in which position is specified by the distance from the origin and the angle between the line from the origin to a point and a reference direction. A PolarCS shall have two gml:axis property elements.</documentation>
+		</annotation>
+	</element>
+	<complexType name="PolarCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="PolarCSPropertyType">
+		<annotation>
+			<documentation>gml:PolarCSPropertyType is a property type for association roles to a polar coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:PolarCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="CylindricalCS" type="gml:CylindricalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:CylindricalCS is a three-dimensional coordinate system consisting of a polar coordinate system extended by a straight coordinate axis perpendicular to the plane spanned by the polar coordinate system. A CylindricalCS shall have three gml:axis property elements.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CylindricalCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="CylindricalCSPropertyType">
+		<annotation>
+			<documentation>gml:CylindricalCSPropertyType is a property type for association roles to a cylindrical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:CylindricalCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="AffineCS" type="gml:AffineCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<documentation>gml:AffineCS is a two- or three-dimensional coordinate system with straight axes that are not necessarily orthogonal. An AffineCS shall have two or three gml:axis property elements; the number of property elements shall equal the dimension of the CS.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AffineCSType">
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="AffineCSPropertyType">
+		<annotation>
+			<documentation>gml:AffineCSPropertyType is a property type for association roles to an affine coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AffineCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/coverage.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/coverage.xsd
new file mode 100644
index 0000000..a1bbfa4
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/coverage.xsd
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coverage:3.2.1">coverage.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 20.3.
+A coverage incorporates a mapping from a spatiotemporal domain to a range set, the latter providing the set in which the attribute values live.  The range set may be an arbitrary set including discrete lists, integer or floating point ranges, and multi-dimensional vector spaces.
+A coverage can be viewed as the graph of the coverage function f:A à B, that is as the set of ordered pairs {(x, f(x)) | where x is in A}. This view is especially applicable to the GML encoding of a coverage.  In the case of a discrete coverage, the domain set A is partitioned into a collection of subsets (typically a disjoint collection) A = UAi and the function f is constant on each Ai. For a spatial domain, the Ai are geometry elements, hence the coverage can be viewed as a collection [...]
+A coverage is implemented as a GML feature. We can thus speak of a "temperature distribution feature", or a "remotely sensed image feature", or a "soil distribution feature".
+As is the case for any GML object, a coverage object may also be the value of a property of a feature.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="feature.xsd"/>
+	<include schemaLocation="valueObjects.xsd"/>
+	<include schemaLocation="grids.xsd"/>
+	<include schemaLocation="geometryAggregates.xsd"/>
+	<complexType name="AbstractCoverageType" abstract="true">
+		<annotation>
+			<documentation>The base type for coverages is gml:AbstractCoverageType. The basic elements of a coverage can be seen in this content model: the coverage contains gml:domainSet and gml:rangeSet properties. The gml:domainSet property describes the domain of the coverage and the gml:rangeSet property describes the range of the coverage.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractFeatureType">
+				<sequence>
+					<element ref="gml:domainSet"/>
+					<element ref="gml:rangeSet"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractCoverage" type="gml:AbstractCoverageType" abstract="true" substitutionGroup="gml:AbstractFeature">
+		<annotation>
+			<documentation>This element serves as the head of a substitution group which may contain any coverage whose type is derived from gml:AbstractCoverageType.  It may act as a variable in the definition of content models where it is required to permit any coverage to be valid.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DiscreteCoverageType">
+		<complexContent>
+			<extension base="gml:AbstractCoverageType">
+				<sequence>
+					<element ref="gml:coverageFunction" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractDiscreteCoverage" type="gml:DiscreteCoverageType" abstract="true" substitutionGroup="gml:AbstractCoverage">
+		<annotation>
+			<documentation>A discrete coverage consists of a domain set, range set and optionally a coverage function. The domain set consists of either spatial or temporal geometry objects, finite in number. The range set is comprised of a finite number of attribute values each of which is associated to every direct position within any single spatiotemporal object in the domain. In other words, the range values are constant on each spatiotemporal object in the domain. This coverage function maps [...]
+This element serves as the head of a substitution group which may contain any discrete coverage whose type is derived from gml:DiscreteCoverageType.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractContinuousCoverageType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractCoverageType">
+				<sequence>
+					<element ref="gml:coverageFunction" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractContinuousCoverage" type="gml:AbstractContinuousCoverageType" abstract="true" substitutionGroup="gml:AbstractFeature">
+		<annotation>
+			<documentation>A continuous coverage as defined in ISO 19123 is a coverage that can return different values for the same feature attribute at different direct positions within a single spatiotemporal object in its spatiotemporal domain. The base type for continuous coverages is AbstractContinuousCoverageType.
+The coverageFunction element describes the mapping function. 
+The abstract element gml:AbstractContinuousCoverage serves as the head of a substitution group which may contain any continuous coverage whose type is derived from gml:AbstractContinuousCoverageType.</documentation>
+		</annotation>
+	</element>
+	<element name="domainSet" type="gml:DomainSetType">
+		<annotation>
+			<documentation>The gml:domainSet property element describes the spatio-temporal region of interest, within which the coverage is defined. Its content model is given by gml:DomainSetType.
+The value of the domain is thus a choice between a gml:AbstractGeometry and a gml:AbstractTimeObject.  In the instance these abstract elements will normally be substituted by a geometry complex or temporal complex, to represent spatial coverages and time-series, respectively.  
+The presence of the gml:AssociationAttributeGroup means that domainSet follows the usual GML property model and may use the xlink:href attribute to point to the domain, as an alternative to describing the domain inline. Ownership semantics may be provided using the gml:OwnershipAttributeGroup.
+</documentation>
+		</annotation>
+	</element>
+	<complexType name="DomainSetType">
+		<sequence minOccurs="0">
+			<choice>
+				<element ref="gml:AbstractGeometry"/>
+				<element ref="gml:AbstractTimeObject"/>
+			</choice>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="rangeSet" type="gml:RangeSetType">
+		<annotation>
+			<documentation>The gml:rangeSet property element contains the values of the coverage (sometimes called the attribute values).  Its content model is given by gml:RangeSetType.
+This content model supports a structural description of the range.  The semantic information describing the range set is embedded using a uniform method, as part of the explicit values, or as a template value accompanying the representation using gml:DataBlock and gml:File.
+The values from each component (or "band") in the range may be encoded within a gml:ValueArray element or a concrete member of the gml:AbstractScalarValueList substitution group . Use of these elements satisfies the value-type homogeneity requirement.</documentation>
+		</annotation>
+	</element>
+	<complexType name="RangeSetType">
+		<choice>
+			<element ref="gml:ValueArray" maxOccurs="unbounded"/>
+			<element ref="gml:AbstractScalarValueList" maxOccurs="unbounded"/>
+			<element ref="gml:DataBlock"/>
+			<element ref="gml:File"/>
+		</choice>
+	</complexType>
+	<element name="DataBlock" type="gml:DataBlockType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>gml:DataBlock describes the Range as a block of text encoded values similar to a Common Separated Value (CSV) representation.
+The range set parameterization is described by the property gml:rangeParameters.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DataBlockType">
+		<sequence>
+			<element ref="gml:rangeParameters"/>
+			<choice>
+				<element ref="gml:tupleList"/>
+				<element ref="gml:doubleOrNilReasonTupleList"/>
+			</choice>
+		</sequence>
+	</complexType>
+	<element name="rangeParameters" type="gml:AssociationRoleType"/>
+	<element name="tupleList" type="gml:CoordinatesType">
+		<annotation>
+			<documentation>gml:CoordinatesType consists of a list of coordinate tuples, with each coordinate tuple separated by the ts or tuple separator (whitespace), and each coordinate in the tuple by the cs or coordinate separator (comma).
+The gml:tupleList encoding is effectively "band-interleaved".</documentation>
+		</annotation>
+	</element>
+	<element name="doubleOrNilReasonTupleList" type="gml:doubleOrNilReasonList">
+		<annotation>
+			<documentation>gml:doubleOrNilReasonList consists of a list of gml:doubleOrNilReason values, each separated by a whitespace. The gml:doubleOrNilReason values are grouped into tuples where the dimension of each tuple in the list is equal to the number of range parameters.</documentation>
+		</annotation>
+	</element>
+	<element name="File" type="gml:FileType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>for efficiency reasons, GML also provides a means of encoding the range set in an arbitrary external encoding, such as a binary file.  This encoding may be "well-known" but this is not required. This mode uses the gml:File element.
+The values of the coverage (attribute values in the range set) are transmitted in a external file that is referenced from the XML structure described by gml:FileType.  The external file is referenced by the gml:fileReference property that is an anyURI (the gml:fileName property has been deprecated).  This means that the external file may be located remotely from the referencing GML instance. 
+The gml:compression property points to a definition of a compression algorithm through an anyURI.  This may be a retrievable, computable definition or simply a reference to an unambiguous name for the compression method.
+The gml:mimeType property points to a definition of the file mime type.
+The gml:fileStructure property is defined by a codelist. Note further that all values shall be enclosed in a single file. Multi-file structures for values are not supported in GML.
+The semantics of the range set is described as above using the gml:rangeParameters property.
+Note that if any compression algorithm is applied, the structure above applies only to the pre-compression or post-decompression structure of the file.
+Note that the fields within a record match the gml:valueComponents of the gml:CompositeValue in document order.</documentation>
+		</annotation>
+	</element>
+	<complexType name="FileType">
+		<sequence>
+			<element ref="gml:rangeParameters"/>
+			<choice>
+				<element name="fileName" type="anyURI">
+					<annotation>
+						<appinfo>deprecated</appinfo>
+					</annotation>
+				</element>
+				<element name="fileReference" type="anyURI"/>
+			</choice>
+			<element name="fileStructure" type="gml:CodeType"/>
+			<element name="mimeType" type="anyURI" minOccurs="0"/>
+			<element name="compression" type="anyURI" minOccurs="0"/>
+		</sequence>
+	</complexType>
+	<element name="coverageFunction" type="gml:CoverageFunctionType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>The gml:coverageFunction property describes the mapping function from the domain to the range of the coverage.
+The value of the CoverageFunction is one of gml:CoverageMappingRule and gml:GridFunction.
+If the gml:coverageFunction property is omitted for a gridded coverage (including rectified gridded coverages) the gml:startPoint is assumed to be the value of the gml:low property in the gml:Grid geometry, and the gml:sequenceRule is assumed to be linear and the gml:axisOrder property is assumed to be "+1 +2".</documentation>
+		</annotation>
+	</element>
+	<complexType name="CoverageFunctionType">
+		<choice>
+			<element ref="gml:MappingRule"/>
+			<element ref="gml:CoverageMappingRule"/>
+			<element ref="gml:GridFunction"/>
+		</choice>
+	</complexType>
+	<element name="CoverageMappingRule" type="gml:MappingRuleType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>gml:CoverageMappingRule provides a formal or informal description of the coverage function.
+The mapping rule may be defined as an in-line string (gml:ruleDefinition) or via a remote reference through xlink:href (gml:ruleReference).  
+If no rule name is specified, the default is 'Linear' with respect to members of the domain in document order.</documentation>
+		</annotation>
+	</element>
+	<complexType name="MappingRuleType" final="#all">
+		<choice>
+			<element name="ruleDefinition" type="string"/>
+			<element name="ruleReference" type="gml:ReferenceType"/>
+		</choice>
+	</complexType>
+	<element name="GridFunction" type="gml:GridFunctionType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>gml:GridFunction provides an explicit mapping rule for grid geometries, i.e. the domain shall be a geometry of type grid.  It describes the mapping of grid posts (discrete point grid coverage) or grid cells (discrete surface coverage) to the values in the range set.
+The gml:startPoint is the index position of a point in the grid that is mapped to the first point in the range set (this is also the index position of the first grid post).  If the gml:startPoint property is omitted the gml:startPoint is assumed to be equal to the value of gml:low in the gml:Grid geometry. Subsequent points in the mapping are determined by the value of the gml:sequenceRule.</documentation>
+		</annotation>
+	</element>
+	<complexType name="GridFunctionType">
+		<sequence>
+			<element name="sequenceRule" type="gml:SequenceRuleType" minOccurs="0"/>
+			<element name="startPoint" type="gml:integerList" minOccurs="0"/>
+		</sequence>
+	</complexType>
+	<complexType name="SequenceRuleType">
+		<annotation>
+			<documentation>The gml:SequenceRuleType is derived from the gml:SequenceRuleEnumeration through the addition of an axisOrder attribute.  The gml:SequenceRuleEnumeration is an enumerated type. The rule names are defined in ISO 19123. If no rule name is specified the default is "Linear".</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:SequenceRuleEnumeration">
+				<attribute name="order" type="gml:IncrementOrder">
+					<annotation>
+						<appinfo>deprecated</appinfo>
+					</annotation>
+				</attribute>
+				<attribute name="axisOrder" type="gml:AxisDirectionList"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<simpleType name="SequenceRuleEnumeration">
+		<restriction base="string">
+			<enumeration value="Linear"/>
+			<enumeration value="Boustrophedonic"/>
+			<enumeration value="Cantor-diagonal"/>
+			<enumeration value="Spiral"/>
+			<enumeration value="Morton"/>
+			<enumeration value="Hilbert"/>
+		</restriction>
+	</simpleType>
+	<simpleType name="AxisDirectionList">
+		<annotation>
+			<documentation>The different values in a gml:AxisDirectionList indicate the incrementation order to be used on all axes of the grid. Each axis shall be mentioned once and only once.</documentation>
+		</annotation>
+		<list itemType="gml:AxisDirection"/>
+	</simpleType>
+	<simpleType name="AxisDirection">
+		<annotation>
+			<documentation>The value of a gml:AxisDirection indicates the incrementation order to be used on an axis of the grid.</documentation>
+		</annotation>
+		<restriction base="string">
+			<pattern value="[\+\-][1-9][0-9]*"/>
+		</restriction>
+	</simpleType>
+	<element name="MultiPointCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
+		<annotation>
+			<documentation>In a gml:MultiPointCoverage the domain set is a gml:MultiPoint, that is a collection of arbitrarily distributed geometric points.
+The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiPoint.
+In a gml:MultiPointCoverage the mapping from the domain to the range is straightforward.
+-	For gml:DataBlock encodings the points of the gml:MultiPoint are mapped in document order to the tuples of the data block.
+-	For gml:CompositeValue encodings the points of the gml:MultiPoint are mapped to the members of the composite value in document order.
+-	For gml:File encodings the points of the gml:MultiPoint are mapped to the records of the file in sequential order.
+</documentation>
+		</annotation>
+	</element>
+	<element name="MultiCurveCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
+		<annotation>
+			<documentation>In a gml:MultiCurveCoverage the domain is partioned into a collection of curves comprising a gml:MultiCurve.  The coverage function then maps each curve in the collection to a value in the range set.
+The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiCurve.
+In a gml:MultiCurveCoverage the mapping from the domain to the range is straightforward.
+-	For gml:DataBlock encodings the curves of the gml:MultiCurve are mapped in document order to the tuples of the data block.
+-	For gml:CompositeValue encodings the curves of the gml:MultiCurve are mapped to the members of the composite value in document order.
+-	For gml:File encodings the curves of the gml:MultiCurve are mapped to the records of the file in sequential order.
+</documentation>
+		</annotation>
+	</element>
+	<element name="MultiSurfaceCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
+		<annotation>
+			<documentation>In a gml:MultiSurfaceCoverage the domain is partioned into a collection of surfaces comprising a gml:MultiSurface.  The coverage function than maps each surface in the collection to a value in the range set.
+The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiSurface.
+In a gml:MultiSurfaceCoverage the mapping from the domain to the range is straightforward.
+-	For gml:DataBlock encodings the surfaces of the gml:MultiSurface are mapped in document order to the tuples of the data block.
+-	For gml:CompositeValue encodings the surfaces of the gml:MultiSurface are mapped to the members of the composite value in document order.
+-	For gml:File encodings the surfaces of the gml:MultiSurface are mapped to the records of the file in sequential order.
+</documentation>
+		</annotation>
+	</element>
+	<element name="MultiSolidCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
+		<annotation>
+			<documentation>In a gml:MultiSolidCoverage the domain is partioned into a collection of solids comprising a gml:MultiSolid.  The coverage function than maps each solid in the collection to a value in the range set.
+The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiSolid.
+In a gml:MultiSolidCoverage the mapping from the domain to the range is straightforward.
+-	For gml:DataBlock encodings the solids of the gml:MultiSolid are mapped in document order to the tuples of the data block.
+-	For gml:CompositeValue encodings the solids of the gml:MultiSolid are mapped to the members of the composite value in document order.
+-	For gml:File encodings the solids of the gml:MultiSolid are mapped to the records of the file in sequential order.
+</documentation>
+		</annotation>
+	</element>
+	<element name="GridCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
+		<annotation>
+			<documentation>A gml:GriddedCoverage is a discrete point coverage in which the domain set is a geometric grid of points.
+Note that this is the same as the gml:MultiPointCoverage except that we have a gml:Grid to describe the domain.
+The simple gridded coverage is not geometrically referenced and hence no geometric positions are assignable to the points in the grid. Such geometric positioning is introduced in the gml:RectifiedGridCoverage.</documentation>
+		</annotation>
+	</element>
+	<element name="RectifiedGridCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
+		<annotation>
+			<documentation>The gml:RectifiedGridCoverage is a discrete point coverage based on a rectified grid. It is similar to the grid coverage except that the points of the grid are geometrically referenced. The rectified grid coverage has a domain that is a gml:RectifiedGrid geometry.</documentation>
+		</annotation>
+	</element>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/datums.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/datums.xsd
new file mode 100644
index 0000000..a62b866
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/datums.xsd
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Clemens Portele (interactive instruments) -->
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:datums:3.2.1">datums.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 13.5
+The datums schema components can be divided into three logical parts, which define elements and types for XML encoding of the definitions of:
+-	Abstract datum
+-	Geodetic datums, including ellipsoid and prime meridian
+-	Multiple other concrete types of spatial or temporal datums
+These schema components encode the Datum packages of the UML Models of ISO 19111 Clause 10 and ISO/DIS 19136 D.3.10.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="referenceSystems.xsd"/>
+	<include schemaLocation="measures.xsd"/>
+	<element name="AbstractDatum" type="gml:AbstractDatumType" abstract="true" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>A gml:AbstractDatum specifies the relationship of a coordinate system to the earth, thus creating a coordinate reference system. A datum uses a parameter or set of parameters that determine the location of the origin of the coordinate reference system. Each datum subtype may be associated with only specific types of coordinate systems. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a  [...]
+		</annotation>
+	</element>
+	<complexType name="AbstractDatumType" abstract="true">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:domainOfValidity" minOccurs="0"/>
+					<element ref="gml:scope" maxOccurs="unbounded"/>
+					<element ref="gml:anchorDefinition" minOccurs="0"/>
+					<element ref="gml:realizationEpoch" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="anchorDefinition" type="gml:CodeType">
+		<annotation>
+			<documentation>gml:anchorDefinition is a description, possibly including coordinates, of the definition used to anchor the datum to the Earth. Also known as the "origin", especially for engineering and image datums. The codeSpace attribute may be used to reference a source of more detailed on this point or surface, or on a set of such descriptions.
+-	For a geodetic datum, this point is also known as the fundamental point, which is traditionally the point where the relationship between geoid and ellipsoid is defined. In some cases, the "fundamental point" may consist of a number of points. In those cases, the parameters defining the geoid/ellipsoid relationship have been averaged for these points, and the averages adopted as the datum definition.
+-	For an engineering datum, the anchor definition may be a physical point, or it may be a point with defined coordinates in another CRS.may
+-	For an image datum, the anchor definition is usually either the centre of the image or the corner of the image.
+-	For a temporal datum, this attribute is not defined. Instead of the anchor definition, a temporal datum carries a separate time origin of type DateTime.</documentation>
+		</annotation>
+	</element>
+	<element name="realizationEpoch" type="date">
+		<annotation>
+			<documentation>gml:realizationEpoch is the time after which this datum definition is valid. See ISO 19111 Table 32 for details.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DatumPropertyType">
+		<annotation>
+			<documentation>gml:DatumPropertyType is a property type for association roles to a datum, either referencing or containing the definition of that datum.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractDatum"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="GeodeticDatum" type="gml:GeodeticDatumType" substitutionGroup="gml:AbstractDatum">
+		<annotation>
+			<documentation>gml:GeodeticDatum is a geodetic datum defines the precise location and orientation in 3-dimensional space of a defined ellipsoid (or sphere), or of a Cartesian coordinate system centered in this ellipsoid (or sphere).</documentation>
+		</annotation>
+	</element>
+	<complexType name="GeodeticDatumType">
+		<complexContent>
+			<extension base="gml:AbstractDatumType">
+				<sequence>
+					<element ref="gml:primeMeridian"/>
+					<element ref="gml:ellipsoid"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="primeMeridian" type="gml:PrimeMeridianPropertyType">
+		<annotation>
+			<documentation>gml:primeMeridian is an association role to the prime meridian used by this geodetic datum.</documentation>
+		</annotation>
+	</element>
+	<element name="ellipsoid" type="gml:EllipsoidPropertyType">
+		<annotation>
+			<documentation>gml:ellipsoid is an association role to the ellipsoid used by this geodetic datum.</documentation>
+		</annotation>
+	</element>
+	<complexType name="GeodeticDatumPropertyType">
+		<annotation>
+			<documentation>gml:GeodeticDatumPropertyType is a property type for association roles to a geodetic datum, either referencing or containing the definition of that datum.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:GeodeticDatum"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="Ellipsoid" type="gml:EllipsoidType" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>A gml:Ellipsoid is a geometric figure that may be used to describe the approximate shape of the earth. In mathematical terms, it is a surface formed by the rotation of an ellipse about its minor axis.</documentation>
+		</annotation>
+	</element>
+	<complexType name="EllipsoidType">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:semiMajorAxis"/>
+					<element ref="gml:secondDefiningParameter"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="semiMajorAxis" type="gml:MeasureType">
+		<annotation>
+			<documentation>gml:semiMajorAxis specifies the length of the semi-major axis of the ellipsoid, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a length, such as metres or feet.</documentation>
+		</annotation>
+	</element>
+	<element name="secondDefiningParameter">
+		<annotation>
+			<documentation>gml:secondDefiningParameter is a property containing the definition of the second parameter that defines the shape of an ellipsoid. An ellipsoid requires two defining parameters: semi-major axis and inverse flattening or semi-major axis and semi-minor axis. When the reference body is a sphere rather than an ellipsoid, only a single defining parameter is required, namely the radius of the sphere; in that case, the semi-major axis "degenerates" into the radius of the sphere.
+The inverseFlattening element contains the inverse flattening value of the ellipsoid. This value is a scale factor (or ratio). It uses gml:LengthType with the restriction that the unit of measure referenced by the uom attribute must be suitable for a scale factor, such as percent, permil, or parts-per-million.
+The semiMinorAxis element contains the length of the semi-minor axis of the ellipsoid. When the isSphere element is included, the ellipsoid is degenerate and is actually a sphere. The sphere is completely defined by the semi-major axis, which is the radius of the sphere.</documentation>
+		</annotation>
+		<complexType>
+			<sequence>
+				<element ref="gml:SecondDefiningParameter"/>
+			</sequence>
+		</complexType>
+	</element>
+	<element name="SecondDefiningParameter">
+		<complexType>
+			<choice>
+				<element name="inverseFlattening" type="gml:MeasureType"/>
+				<element name="semiMinorAxis" type="gml:LengthType"/>
+				<element name="isSphere" type="boolean" default="true"/>
+			</choice>
+		</complexType>
+	</element>
+	<complexType name="EllipsoidPropertyType">
+		<annotation>
+			<documentation>gml:EllipsoidPropertyType is a property type for association roles to an ellipsoid, either referencing or containing the definition of that ellipsoid.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:Ellipsoid"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="PrimeMeridian" type="gml:PrimeMeridianType" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>A gml:PrimeMeridian defines the origin from which longitude values are determined. The default value for the prime meridian gml:identifier value is "Greenwich".</documentation>
+		</annotation>
+	</element>
+	<complexType name="PrimeMeridianType">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:greenwichLongitude"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="greenwichLongitude" type="gml:AngleType">
+		<annotation>
+			<documentation>gml:greenwichLongitude is the longitude of the prime meridian measured from the Greenwich meridian, positive eastward. If the value of the prime meridian "name" is "Greenwich" then the value of greenwichLongitude shall be 0 degrees.</documentation>
+		</annotation>
+	</element>
+	<complexType name="PrimeMeridianPropertyType">
+		<annotation>
+			<documentation>gml:PrimeMeridianPropertyType is a property type for association roles to a prime meridian, either referencing or containing the definition of that meridian.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:PrimeMeridian"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="EngineeringDatum" type="gml:EngineeringDatumType" substitutionGroup="gml:AbstractDatum">
+		<annotation>
+			<documentation>gml:EngineeringDatum defines the origin of an engineering coordinate reference system, and is used in a region around that origin. This origin may be fixed with respect to the earth (such as a defined point at a construction site), or be a defined point on a moving vehicle (such as on a ship or satellite).</documentation>
+		</annotation>
+	</element>
+	<complexType name="EngineeringDatumType">
+		<complexContent>
+			<extension base="gml:AbstractDatumType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="EngineeringDatumPropertyType">
+		<annotation>
+			<documentation>gml:EngineeringDatumPropertyType is a property type for association roles to an engineering datum, either referencing or containing the definition of that datum.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:EngineeringDatum"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="ImageDatum" type="gml:ImageDatumType" substitutionGroup="gml:AbstractDatum">
+		<annotation>
+			<documentation>gml:ImageDatum defines the origin of an image coordinate reference system, and is used in a local context only. For an image datum, the anchor definition is usually either the centre of the image or the corner of the image. For more information, see ISO 19111 B.3.5.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ImageDatumType">
+		<complexContent>
+			<extension base="gml:AbstractDatumType">
+				<sequence>
+					<element ref="gml:pixelInCell"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="pixelInCell" type="gml:CodeWithAuthorityType">
+		<annotation>
+			<documentation>gml:pixelInCell is a specification of the way an image grid is associated with the image data attributes. The required codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ImageDatumPropertyType">
+		<annotation>
+			<documentation>gml:ImageDatumPropertyType is a property type for association roles to an image datum, either referencing or containing the definition of that datum.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:ImageDatum"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="VerticalDatum" type="gml:VerticalDatumType" substitutionGroup="gml:AbstractDatum">
+		<annotation>
+			<documentation>gml:VerticalDatum is a textual description and/or a set of parameters identifying a particular reference level surface used as a zero-height surface, including its position with respect to the Earth for any of the height types recognized by this International Standard.</documentation>
+		</annotation>
+	</element>
+	<complexType name="VerticalDatumType">
+		<complexContent>
+			<extension base="gml:AbstractDatumType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="VerticalDatumPropertyType">
+		<annotation>
+			<documentation>gml:VerticalDatumPropertyType is property type for association roles to a vertical datum, either referencing or containing the definition of that datum.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:VerticalDatum"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="TemporalDatum" type="gml:TemporalDatumType" substitutionGroup="gml:AbstractDatum">
+		<annotation>
+			<documentation>A gml:TemporalDatum defines the origin of a Temporal Reference System. This type omits the "anchorDefinition" and "realizationEpoch" elements and adds the "origin" element with the dateTime type.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TemporalDatumType">
+		<complexContent>
+			<extension base="gml:TemporalDatumBaseType">
+				<sequence>
+					<element ref="gml:origin"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TemporalDatumBaseType" abstract="true">
+		<annotation>
+			<documentation>The TemporalDatumBaseType partially defines the origin of a temporal coordinate reference system. This type restricts the AbstractDatumType to remove the "anchorDefinition" and "realizationEpoch" elements.</documentation>
+		</annotation>
+		<complexContent>
+			<restriction base="gml:AbstractDatumType">
+				<sequence>
+					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:description" minOccurs="0"/>
+					<element ref="gml:descriptionReference" minOccurs="0"/>
+					<element ref="gml:identifier"/>
+					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:remarks" minOccurs="0"/>
+					<element ref="gml:domainOfValidity" minOccurs="0"/>
+					<element ref="gml:scope" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute ref="gml:id" use="required"/>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<element name="origin" type="dateTime">
+		<annotation>
+			<documentation>gml:origin is the date and time origin of this temporal datum.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TemporalDatumPropertyType">
+		<annotation>
+			<documentation>gml:TemporalDatumPropertyType is a property type for association roles to a temporal datum, either referencing or containing the definition of that datum.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TemporalDatum"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/defaultStyle.xsd
similarity index 95%
rename from pycsw/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd
rename to pycsw/core/schemas/ogc/gml/3.2.1/defaultStyle.xsd
index 08ecd8f..16fa6e8 100644
--- a/pycsw/schemas/ogc/gml/3.1.1/base/defaultStyle.xsd
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/defaultStyle.xsd
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:smil20="http://www.w3.org/2001/SMIL20/" elementFormDefault="qualified" version="3.1.1 2010-01-28">
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:smil20="http://www.w3.org/2001/SMIL20/" elementFormDefault="qualified" version="3.2.1.2">
 	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-defaultStyle:v3.1.0">defaultStyle.xsd</appinfo>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gml:3.2.1">defaultStyle.xsd</appinfo>
 		<documentation>
-			Default Style schema for GML 3.1.1
-			
 			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+			Copyright (c) 2007,2010 Open Geospatial Consortium.
 			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
        includes and imports
 	============================================================== -->
+	<include schemaLocation="gml.xsd"/>
 	<include schemaLocation="measures.xsd"/>
-	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="http://schemas.opengis.net/gml/3.1.1/smil/smil20.xsd"/>
+	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="../3.1.1/smil/smil20.xsd"/>
 	<!-- ==============================================================
       the Style property
 	============================================================== -->
@@ -29,7 +28,7 @@
 			<documentation>[complexType of] Top-level property. Used in application schemas to "attach" the styling information to GML data. The link between the data and the style should be established through this property only.</documentation>
 		</annotation>
 		<sequence>
-			<element ref="gml:_Style" minOccurs="0"/>
+			<element ref="gml:AbstractStyle" minOccurs="0"/>
 		</sequence>
 		<attribute name="about" type="anyURI" use="optional"/>
 		<attributeGroup ref="gml:AssociationAttributeGroup"/>
@@ -37,7 +36,7 @@
 	<!-- ==============================================================
        the Style
 	============================================================== -->
-	<element name="_Style" type="gml:AbstractStyleType" abstract="true" substitutionGroup="gml:_GML">
+	<element name="AbstractStyle" type="gml:AbstractStyleType" abstract="true" substitutionGroup="gml:AbstractGML">
 		<annotation>
 			<documentation>The value of the top-level property. It is an abstract element. Used as the head element of the substitution group for extensibility purposes.</documentation>
 		</annotation>
@@ -52,7 +51,7 @@
 		</complexContent>
 	</complexType>
 	<!-- =========================================================== -->
-	<element name="Style" type="gml:StyleType" substitutionGroup="gml:_Style">
+	<element name="Style" type="gml:StyleType" substitutionGroup="gml:AbstractStyle">
 		<annotation>
 			<documentation>Predefined concrete value of the top-level property. Encapsulates all other styling information.</documentation>
 		</annotation>
@@ -93,7 +92,7 @@
 	<!-- ==============================================================
       Feature Style
 	============================================================== -->
-	<element name="FeatureStyle" type="gml:FeatureStyleType" substitutionGroup="gml:_GML">
+	<element name="FeatureStyle" type="gml:FeatureStyleType" substitutionGroup="gml:AbstractGML">
 		<annotation>
 			<documentation>The style descriptor for features.</documentation>
 		</annotation>
@@ -170,7 +169,7 @@
 	<!-- ==============================================================
        Geometry Style
 	============================================================== -->
-	<element name="GeometryStyle" type="gml:GeometryStyleType" substitutionGroup="gml:_GML">
+	<element name="GeometryStyle" type="gml:GeometryStyleType" substitutionGroup="gml:AbstractGML">
 		<annotation>
 			<documentation>The style descriptor for geometries of a feature.</documentation>
 		</annotation>
@@ -221,7 +220,7 @@
 	<!-- ==============================================================
        Topology Style
 	============================================================== -->
-	<element name="TopologyStyle" type="gml:TopologyStyleType" substitutionGroup="gml:_GML">
+	<element name="TopologyStyle" type="gml:TopologyStyleType" substitutionGroup="gml:AbstractGML">
 		<annotation>
 			<documentation>The style descriptor for topologies of a feature. Describes individual topology elements styles.</documentation>
 		</annotation>
@@ -272,7 +271,7 @@
 	<!-- ==============================================================
        Label Style
 	============================================================== -->
-	<element name="LabelStyle" type="gml:LabelStyleType" substitutionGroup="gml:_GML">
+	<element name="LabelStyle" type="gml:LabelStyleType" substitutionGroup="gml:AbstractGML">
 		<annotation>
 			<documentation>The style descriptor for labels of a feature, geometry or topology.</documentation>
 		</annotation>
@@ -313,7 +312,7 @@
 	<!-- ==============================================================
       Graph Style
 	============================================================== -->
-	<element name="GraphStyle" type="gml:GraphStyleType" substitutionGroup="gml:_GML">
+	<element name="GraphStyle" type="gml:GraphStyleType" substitutionGroup="gml:AbstractGML">
 		<annotation>
 			<documentation>The style descriptor for a graph consisting of a number of features. Describes graph-specific style attributes.</documentation>
 		</annotation>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/deprecatedTypes.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/deprecatedTypes.xsd
new file mode 100644
index 0000000..7dbd79b
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/deprecatedTypes.xsd
@@ -0,0 +1,1133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:deprecatedTypes:3.2.1">deprecatedTypes.xsd</appinfo>
+		<documentation>All global schema components that are part of the GML schema, but were deprecated. See Annex I.
+			
+			GML is an OGC Standard.
+			Copyright (c) 2007,2010 Open Geospatial Consortium.
+			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<element name="Null" type="gml:NilReasonType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="anchorPoint" type="gml:CodeType" substitutionGroup="gml:anchorDefinition">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="datumRef" type="gml:DatumPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesPrimeMeridian" type="gml:PrimeMeridianPropertyType" substitutionGroup="gml:primeMeridian">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesEllipsoid" type="gml:EllipsoidPropertyType" substitutionGroup="gml:ellipsoid">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="geodeticDatumRef" type="gml:GeodeticDatumPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="ellipsoidRef" type="gml:EllipsoidPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="primeMeridianRef" type="gml:PrimeMeridianPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="engineeringDatumRef" type="gml:EngineeringDatumPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="imageDatumRef" type="gml:ImageDatumPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="verticalDatumRef" type="gml:VerticalDatumPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="temporalDatumRef" type="gml:TemporalDatumPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="coordinateOperationRef" type="gml:CoordinateOperationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="singleOperationRef" type="gml:SingleOperationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="AbstractOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:AbstractSingleOperation">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="OperationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractOperation"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="operationRef" type="gml:OperationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="generalConversionRef" type="gml:GeneralConversionPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="generalTransformationRef" type="gml:GeneralTransformationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesSingleOperation" type="gml:CoordinateOperationPropertyType" substitutionGroup="gml:coordOperation">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="concatenatedOperationRef" type="gml:ConcatenatedOperationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesOperation" type="gml:CoordinateOperationPropertyType" substitutionGroup="gml:coordOperation">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="passThroughOperationRef" type="gml:PassThroughOperationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesMethod" type="gml:OperationMethodPropertyType" substitutionGroup="gml:method">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesValue" type="gml:AbstractGeneralParameterValuePropertyType" substitutionGroup="gml:parameterValue">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="conversionRef" type="gml:ConversionPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="transformationRef" type="gml:TransformationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="dmsAngleValue" type="gml:DMSAngleType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="valueOfParameter" type="gml:OperationParameterPropertyType" substitutionGroup="gml:operationParameter">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="includesValue" type="gml:AbstractGeneralParameterValuePropertyType" substitutionGroup="gml:parameterValue">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="valuesOfGroup" type="gml:OperationParameterGroupPropertyType" substitutionGroup="gml:group">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="methodFormula" type="gml:CodeType" substitutionGroup="gml:formula">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:generalOperationParameter">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="operationMethodRef" type="gml:OperationMethodPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="abstractGeneralOperationParameterRef" type="gml:AbstractGeneralOperationParameterPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="operationParameterRef" type="gml:OperationParameterPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="includesParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:parameter">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="operationParameterGroupRef" type="gml:OperationParameterPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="referenceSystemRef" type="gml:CRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="crsRef" type="gml:CRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="coordinateSystemAxisRef" type="gml:CoordinateSystemAxisPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesAxis" type="gml:CoordinateSystemAxisPropertyType" substitutionGroup="gml:axis">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="coordinateSystemRef" type="gml:CoordinateSystemPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="ellipsoidalCSRef" type="gml:EllipsoidalCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="cartesianCSRef" type="gml:CartesianCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="verticalCSRef" type="gml:VerticalCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="TemporalCS" type="gml:TemporalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="TemporalCSType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="TemporalCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TemporalCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="temporalCSRef" type="gml:TemporalCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="linearCSRef" type="gml:LinearCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="userDefinedCSRef" type="gml:UserDefinedCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="sphericalCSRef" type="gml:SphericalCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="polarCSRef" type="gml:PolarCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="cylindricalCSRef" type="gml:CylindricalCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="ObliqueCartesianCS" type="gml:ObliqueCartesianCSType" substitutionGroup="gml:AbstractCoordinateSystem">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="ObliqueCartesianCSType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractCoordinateSystemType"/>
+		</complexContent>
+	</complexType>
+	<complexType name="ObliqueCartesianCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:ObliqueCartesianCS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="obliqueCartesianCSRef" type="gml:ObliqueCartesianCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="singleCRSRef" type="gml:SingleCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="definedByConversion" type="gml:GeneralConversionPropertyType" substitutionGroup="gml:conversion">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="includesSingleCRS" type="gml:SingleCRSPropertyType" substitutionGroup="gml:componentReferenceSystem">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="compoundCRSRef" type="gml:CompoundCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesEllipsoidalCS" type="gml:EllipsoidalCSPropertyType" substitutionGroup="gml:ellipsoidalCS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesCartesianCS" type="gml:CartesianCSPropertyType" substitutionGroup="gml:cartesianCS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesSphericalCS" type="gml:SphericalCSPropertyType" substitutionGroup="gml:sphericalCS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesGeodeticDatum" type="gml:GeodeticDatumPropertyType" substitutionGroup="gml:geodeticDatum">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesVerticalCS" type="gml:VerticalCSPropertyType" substitutionGroup="gml:verticalCS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesVerticalDatum" type="gml:VerticalDatumPropertyType" substitutionGroup="gml:verticalDatum">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="verticalCRSRef" type="gml:VerticalCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="baseGeographicCRS" type="gml:GeographicCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="projectedCRSRef" type="gml:ProjectedCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesCS" type="gml:CoordinateSystemPropertyType" substitutionGroup="gml:coordinateSystem">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="derivedCRSRef" type="gml:DerivedCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesEngineeringDatum" type="gml:EngineeringDatumPropertyType" substitutionGroup="gml:engineeringDatum">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="engineeringCRSRef" type="gml:EngineeringCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesAffineCS" type="gml:AffineCSPropertyType" substitutionGroup="gml:affineCS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesImageDatum" type="gml:ImageDatumPropertyType" substitutionGroup="gml:imageDatum">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesObliqueCartesianCS" type="gml:ObliqueCartesianCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="imageCRSRef" type="gml:ImageCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesTimeCS" type="gml:TimeCSPropertyType" substitutionGroup="gml:timeCS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesTemporalCS" type="gml:TemporalCSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="usesTemporalDatum" type="gml:TemporalDatumPropertyType" substitutionGroup="gml:temporalDatum">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="temporalCRSRef" type="gml:TemporalCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="GeographicCRS" type="gml:GeographicCRSType" substitutionGroup="gml:AbstractSingleCRS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="GeographicCRSType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<element ref="gml:usesEllipsoidalCS"/>
+					<element ref="gml:usesGeodeticDatum"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="GeographicCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:GeographicCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="geographicCRSRef" type="gml:GeographicCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="GeocentricCRS" type="gml:GeocentricCRSType" substitutionGroup="gml:AbstractSingleCRS">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="GeocentricCRSType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractCRSType">
+				<sequence>
+					<choice>
+						<element ref="gml:usesCartesianCS"/>
+						<element ref="gml:usesSphericalCS"/>
+					</choice>
+					<element ref="gml:usesGeodeticDatum"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="GeocentricCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:GeocentricCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="geocentricCRSRef" type="gml:GeocentricCRSPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<attribute name="uom" type="anyURI">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</attribute>
+	<simpleType name="SuccessionType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="substitution"/>
+			<enumeration value="division"/>
+			<enumeration value="fusion"/>
+			<enumeration value="initiation"/>
+		</restriction>
+	</simpleType>
+	<element name="dmsAngle" type="gml:DMSAngleType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="DMSAngleType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence>
+			<element ref="gml:degrees"/>
+			<choice minOccurs="0">
+				<element ref="gml:decimalMinutes"/>
+				<sequence>
+					<element ref="gml:minutes"/>
+					<element ref="gml:seconds" minOccurs="0"/>
+				</sequence>
+			</choice>
+		</sequence>
+	</complexType>
+	<element name="degrees" type="gml:DegreesType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="DegreesType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:DegreeValueType">
+				<attribute name="direction">
+					<simpleType>
+						<restriction base="string">
+							<enumeration value="N"/>
+							<enumeration value="E"/>
+							<enumeration value="S"/>
+							<enumeration value="W"/>
+							<enumeration value="+"/>
+							<enumeration value="-"/>
+						</restriction>
+					</simpleType>
+				</attribute>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<simpleType name="DegreeValueType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<restriction base="nonNegativeInteger">
+			<maxInclusive value="359"/>
+		</restriction>
+	</simpleType>
+	<element name="decimalMinutes" type="gml:DecimalMinutesType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<simpleType name="DecimalMinutesType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<restriction base="decimal">
+			<minInclusive value="0.00"/>
+			<maxExclusive value="60.00"/>
+		</restriction>
+	</simpleType>
+	<element name="minutes" type="gml:ArcMinutesType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<simpleType name="ArcMinutesType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<restriction base="nonNegativeInteger">
+			<maxInclusive value="59"/>
+		</restriction>
+	</simpleType>
+	<element name="seconds" type="gml:ArcSecondsType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<simpleType name="ArcSecondsType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<restriction base="decimal">
+			<minInclusive value="0.00"/>
+			<maxExclusive value="60.00"/>
+		</restriction>
+	</simpleType>
+	<complexType name="AngleChoiceType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<choice>
+			<element ref="gml:angle"/>
+			<element ref="gml:dmsAngle"/>
+		</choice>
+	</complexType>
+	<attribute name="remoteSchema" type="anyURI">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</attribute>
+	<element name="member" type="gml:AssociationRoleType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="ArrayAssociationType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence>
+			<element ref="gml:AbstractObject" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="members" type="gml:ArrayAssociationType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="StringOrRefType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<simpleContent>
+			<extension base="string">
+				<attributeGroup ref="gml:AssociationAttributeGroup"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<element name="metaDataProperty" type="gml:MetaDataPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="Bag" type="gml:BagType" substitutionGroup="gml:AbstractGML">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="BagType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGMLType">
+				<sequence>
+					<element ref="gml:member" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:members" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Array" type="gml:ArrayType" substitutionGroup="gml:AbstractGML">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="ArrayType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGMLType">
+				<sequence>
+					<element ref="gml:members" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="MetaDataPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractMetaData"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attribute name="about" type="anyURI"/>
+	</complexType>
+	<element name="AbstractMetaData" type="gml:AbstractMetaDataType" abstract="true" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="AbstractMetaDataType" abstract="true" mixed="true">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence/>
+		<attribute ref="gml:id"/>
+	</complexType>
+	<element name="GenericMetaData" type="gml:GenericMetaDataType" substitutionGroup="gml:AbstractMetaData">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="GenericMetaDataType" mixed="true">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent mixed="true">
+			<extension base="gml:AbstractMetaDataType">
+				<sequence>
+					<any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="coordinates" type="gml:CoordinatesType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="pointRep" type="gml:PointPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="location" type="gml:LocationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="LocationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence>
+			<choice>
+				<element ref="gml:AbstractGeometry"/>
+				<element ref="gml:LocationKeyWord"/>
+				<element ref="gml:LocationString"/>
+				<element ref="gml:Null"/>
+			</choice>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="LocationString" type="gml:StringOrRefType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="LocationKeyWord" type="gml:CodeType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="priorityLocation" type="gml:PriorityLocationPropertyType" substitutionGroup="gml:location">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="PriorityLocationPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:LocationPropertyType">
+				<attribute name="priority" type="string"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="featureMember" type="gml:FeaturePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="featureProperty" type="gml:FeaturePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="FeatureArrayPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:AbstractFeature"/>
+		</sequence>
+	</complexType>
+	<element name="featureMembers" type="gml:FeatureArrayPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="BoundedFeatureType" abstract="true">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<restriction base="gml:AbstractFeatureType">
+				<sequence>
+					<group ref="gml:StandardObjectProperties"/>
+					<element ref="gml:boundedBy"/>
+					<element ref="gml:location" minOccurs="0"/>
+				</sequence>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<complexType name="AbstractFeatureCollectionType" abstract="true">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractFeatureType">
+				<sequence>
+					<element ref="gml:featureMember" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:featureMembers" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractFeatureCollection" type="gml:AbstractFeatureCollectionType" abstract="true" substitutionGroup="gml:AbstractFeature">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="FeatureCollection" type="gml:FeatureCollectionType" substitutionGroup="gml:AbstractFeature">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="FeatureCollectionType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractFeatureCollectionType"/>
+		</complexContent>
+	</complexType>
+	<element name="track" type="gml:HistoryPropertyType" substitutionGroup="gml:history">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="DefinitionCollection" type="gml:DictionaryType" substitutionGroup="gml:Definition">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="definitionMember" type="gml:DictionaryEntryType" substitutionGroup="gml:dictionaryEntry">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="indirectEntry" type="gml:IndirectEntryType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="IndirectEntryType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<sequence>
+			<element ref="gml:DefinitionProxy"/>
+		</sequence>
+	</complexType>
+	<element name="DefinitionProxy" type="gml:DefinitionProxyType" substitutionGroup="gml:Definition">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="DefinitionProxyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:DefinitionType">
+				<sequence>
+					<element ref="gml:definitionRef"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="definitionRef" type="gml:ReferenceType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="MappingRule" type="gml:StringOrRefType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<simpleType name="IncrementOrder">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="+x+y"/>
+			<enumeration value="+y+x"/>
+			<enumeration value="+x-y"/>
+			<enumeration value="-x-y"/>
+		</restriction>
+	</simpleType>
+	<element name="centerOf" type="gml:PointPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="position" type="gml:PointPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="extentOf" type="gml:SurfacePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="edgeOf" type="gml:CurvePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="centerLineOf" type="gml:CurvePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiLocation" type="gml:MultiPointPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiCenterOf" type="gml:MultiPointPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiPosition" type="gml:MultiPointPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiCenterLineOf" type="gml:MultiCurvePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiEdgeOf" type="gml:MultiCurvePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiCoverage" type="gml:MultiSurfacePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiExtentOf" type="gml:MultiSurfacePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="polygonPatches" type="gml:SurfacePatchArrayPropertyType" substitutionGroup="gml:patches">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="trianglePatches" type="gml:SurfacePatchArrayPropertyType" substitutionGroup="gml:patches">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiPointDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiCurveDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiSurfaceDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiSolidDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="gridDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="rectifiedGridDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="generalOperationParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:parameter">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="MovingObjectStatus" type="gml:MovingObjectStatusType" substitutionGroup="gml:AbstractTimeSlice">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<complexType name="MovingObjectStatusType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractTimeSliceType">
+				<sequence>
+					<choice>
+						<element name="position" type="gml:GeometryPropertyType"/>
+						<element ref="gml:pos"/>
+						<element ref="gml:locationName"/>
+						<element ref="gml:locationReference"/>
+						<element ref="gml:location"/>
+					</choice>
+					<element name="speed" type="gml:MeasureType" minOccurs="0"/>
+					<element name="bearing" type="gml:DirectionPropertyType" minOccurs="0"/>
+					<element name="acceleration" type="gml:MeasureType" minOccurs="0"/>
+					<element name="elevation" type="gml:MeasureType" minOccurs="0"/>
+					<element ref="gml:status" minOccurs="0"/>
+					<element ref="gml:statusReference" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="status" type="gml:StringOrRefType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="statusReference" type="gml:ReferenceType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+  <element name="topoComplexProperty" type="gml:TopoComplexPropertyType">
+    <annotation>
+			<appinfo>deprecated</appinfo>
+    </annotation>
+  </element>
+	<element name="multiPointProperty" type="gml:MultiPointPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiCurveProperty" type="gml:MultiCurvePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiSurfaceProperty" type="gml:MultiSurfacePropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiSolidProperty" type="gml:MultiSolidPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="multiGeometryProperty" type="gml:MultiGeometryPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="pointArrayProperty" type="gml:PointArrayPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="curveArrayProperty" type="gml:CurveArrayPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="surfaceArrayProperty" type="gml:SurfaceArrayPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+	<element name="solidArrayProperty" type="gml:SolidArrayPropertyType">
+		<annotation>
+			<appinfo>deprecated</appinfo>
+		</annotation>
+	</element>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/dictionary.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/dictionary.xsd
new file mode 100644
index 0000000..8d6f94a
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/dictionary.xsd
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:opengis:specification:gml:schema-xsd:dictionary:v3.2.1">dictionary.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 16.
+Many applications require definitions of terms which are used within instance documents as the values of certain properties or as reference information to tie properties to standard information values in some way.  Units of measure and descriptions of measurable phenomena are two particular examples. 
+It will often be convenient to use definitions provided by external authorities. These may already be packaged for delivery in various ways, both online and offline. In order that they may be referred to from GML documents it is generally necessary that a URI be available for each definition. Where this is the case then it is usually preferable to refer to these directly. 
+Alternatively, it may be convenient or necessary to capture definitions in XML, either embedded within an instance document containing features or as a separate document. The definitions may be transcriptions from an external source, or may be new definitions for a local purpose. In order to support this case, some simple components are provided in GML in the form of 
+-	a generic gml:Definition, which may serve as the basis for more specialized definitions
+-	a generic gml:Dictionary, which allows a set of definitions or references to definitions to be collected 
+These components may be used directly, but also serve as the basis for more specialised definition elements in GML, in particular: coordinate operations, coordinate reference systems, datums, temporal reference systems, and units of measure.  
+Note that the GML definition and dictionary components implement a simple nested hierarchy of definitions with identifiers. The latter provide handles which may be used in the description of more complex relationships between terms. However, the GML dictionary components are not intended to provide direct support for complex taxonomies, ontologies or thesauri.  Specialised XML tools are available to satisfy the more sophisticated requirements.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="gmlBase.xsd"/>
+	<element name="Definition" type="gml:DefinitionType" substitutionGroup="gml:AbstractGML">
+		<annotation>
+			<documentation>The basic gml:Definition element specifies a definition, which can be included in or referenced by a dictionary. 
+The content model for a generic definition is a derivation from gml:AbstractGMLType.  
+The gml:description property element shall hold the definition if this can be captured in a simple text string, or the gml:descriptionReference property element may carry a link to a description elsewhere.
+The gml:identifier element shall provide one identifier identifying this definition. The identifier shall be unique within the dictionaries using this definition. 
+The gml:name elements shall provide zero or more terms and synonyms for which this is the definition.
+The gml:remarks element shall be used to hold additional textual information that is not conceptually part of the definition but is useful in understanding the definition.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DefinitionBaseType">
+		<complexContent>
+			<restriction base="gml:AbstractGMLType">
+				<sequence>
+					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:description" minOccurs="0"/>
+					<element ref="gml:descriptionReference" minOccurs="0"/>
+					<element ref="gml:identifier"/>
+					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute ref="gml:id" use="required"/>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<complexType name="DefinitionType">
+		<complexContent>
+			<extension base="gml:DefinitionBaseType">
+				<sequence>
+					<element ref="gml:remarks" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="remarks" type="string"/>
+	<element name="Dictionary" type="gml:DictionaryType" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>Sets of definitions may be collected into dictionaries or collections.
+A gml:Dictionary is a non-abstract collection of definitions.
+The gml:Dictionary content model adds a list of gml:dictionaryEntry properties that contain or reference gml:Definition objects.  A database handle (gml:id attribute) is required, in order that this collection may be referred to. The standard gml:identifier, gml:description, gml:descriptionReference and gml:name properties are available to reference or contain more information about this dictionary. The gml:description and gml:descriptionReference property elements may be used for a desc [...]
+		</annotation>
+	</element>
+	<complexType name="DictionaryType">
+		<complexContent>
+			<extension base="gml:DefinitionType">
+				<choice minOccurs="0" maxOccurs="unbounded">
+					<element ref="gml:dictionaryEntry"/>
+					<element ref="gml:indirectEntry"/>
+				</choice>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="dictionaryEntry" type="gml:DictionaryEntryType">
+		<annotation>
+			<documentation>This property element contains or refers to the definitions which are members of a dictionary. 
+The content model follows the standard GML property pattern, so a gml:dictionaryEntry may either contain or refer to a single gml:Definition. Since gml:Dictionary is substitutable for gml:Definition, the content of an entry may itself be a lower level dictionary. 
+Note that if the value is provided by reference, this definition does not carry a handle (gml:id) in this context, so does not allow external references to this specific definition in this context.  When used in this way the referenced definition will usually be in a dictionary in the same XML document.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DictionaryEntryType">
+		<complexContent>
+			<extension base="gml:AbstractMemberType">
+				<sequence minOccurs="0">
+					<element ref="gml:Definition"/>
+				</sequence>
+				<attributeGroup ref="gml:AssociationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/direction.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/direction.xsd
new file mode 100644
index 0000000..8b0f7f5
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/direction.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:direction:3.2.1">direction.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 18.
+The direction schema components provide the GML Application Schema developer with a standard property element to describe direction, and associated objects that may be used to express orientation, direction, heading, bearing or other directional aspects of geographic features.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryBasic0d1d.xsd"/>
+	<element name="direction" type="gml:DirectionPropertyType">
+		<annotation>
+			<documentation>The property gml:direction is intended as a pre-defined property expressing a direction to be assigned to features defined in a GML application schema.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DirectionPropertyType">
+		<choice minOccurs="0">
+			<element name="DirectionVector" type="gml:DirectionVectorType"/>
+			<element name="DirectionDescription" type="gml:DirectionDescriptionType"/>
+			<element name="CompassPoint" type="gml:CompassPointEnumeration"/>
+			<element name="DirectionKeyword" type="gml:CodeType"/>
+			<element name="DirectionString" type="gml:StringOrRefType"/>
+		</choice>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<complexType name="DirectionVectorType">
+		<annotation>
+			<documentation>Direction vectors are specified by providing components of a vector.</documentation>
+		</annotation>
+		<choice>
+			<element ref="gml:vector"/>
+			<sequence>
+				<annotation>
+					<appinfo>deprecated</appinfo>
+				</annotation>
+				<element name="horizontalAngle" type="gml:AngleType"/>
+				<element name="verticalAngle" type="gml:AngleType"/>
+			</sequence>
+		</choice>
+	</complexType>
+	<complexType name="DirectionDescriptionType">
+		<annotation>
+			<documentation>direction descriptions are specified by a compass point code, a keyword, a textual description or a reference to a description.
+A gml:compassPoint is specified by a simple enumeration.  	
+In addition, thre elements to contain text-based descriptions of direction are provided.  
+If the direction is specified using a term from a list, gml:keyword should be used, and the list indicated using the value of the codeSpace attribute. 
+if the direction is decribed in prose, gml:direction or gml:reference should be used, allowing the value to be included inline or by reference.</documentation>
+		</annotation>
+		<choice>
+			<element name="compassPoint" type="gml:CompassPointEnumeration"/>
+			<element name="keyword" type="gml:CodeType"/>
+			<element name="description" type="string"/>
+			<element name="reference" type="gml:ReferenceType"/>
+		</choice>
+	</complexType>
+	<simpleType name="CompassPointEnumeration">
+		<annotation>
+			<documentation>These directions are necessarily approximate, giving direction with a precision of 22.5°. It is thus generally unnecessary to specify the reference frame, though this may be detailed in the definition of a GML application language.</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="N"/>
+			<enumeration value="NNE"/>
+			<enumeration value="NE"/>
+			<enumeration value="ENE"/>
+			<enumeration value="E"/>
+			<enumeration value="ESE"/>
+			<enumeration value="SE"/>
+			<enumeration value="SSE"/>
+			<enumeration value="S"/>
+			<enumeration value="SSW"/>
+			<enumeration value="SW"/>
+			<enumeration value="WSW"/>
+			<enumeration value="W"/>
+			<enumeration value="WNW"/>
+			<enumeration value="NW"/>
+			<enumeration value="NNW"/>
+		</restriction>
+	</simpleType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/dynamicFeature.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/dynamicFeature.xsd
new file mode 100644
index 0000000..d755067
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/dynamicFeature.xsd
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:dynamicFeature:3.2.1">dynamicFeature.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 15.6.
+A number of types and relationships are defined to represent the time-varying properties of geographic features. 
+In a comprehensive treatment of spatiotemporal modeling, Langran (see Bibliography) distinguished three principal temporal entities: states, events, and evidence; the schema specified in the following Subclauses incorporates elements for each.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="feature.xsd"/>
+	<include schemaLocation="direction.xsd"/>
+	<element name="dataSource" type="gml:StringOrRefType">
+		<annotation>
+			<documentation>Evidence is represented by a simple gml:dataSource or gml:dataSourceReference property that indicates the source of the temporal data. The remote link attributes of the gml:dataSource element have been deprecated along with its current type.</documentation>
+		</annotation>
+	</element>
+	<element name="dataSourceReference" type="gml:ReferenceType">
+		<annotation>
+			<documentation>Evidence is represented by a simple gml:dataSource or gml:dataSourceReference property that indicates the source of the temporal data.</documentation>
+		</annotation>
+	</element>
+	<group name="dynamicProperties">
+		<annotation>
+			<documentation>A convenience group. This allows an application schema developer to include dynamic properties in a content model in a standard fashion.</documentation>
+		</annotation>
+		<sequence>
+			<element ref="gml:validTime" minOccurs="0"/>
+			<element ref="gml:history" minOccurs="0"/>
+			<element ref="gml:dataSource" minOccurs="0"/>
+			<element ref="gml:dataSourceReference" minOccurs="0"/>
+		</sequence>
+	</group>
+	<element name="DynamicFeature" type="gml:DynamicFeatureType" substitutionGroup="gml:AbstractFeature">
+		<annotation>
+			<documentation>States are captured by time-stamped instances of a feature. The content model extends the standard gml:AbstractFeatureType with the gml:dynamicProperties model group.
+Each time-stamped instance represents a 'snapshot' of a feature. The dynamic feature classes will normally be extended to suit particular applications.  A dynamic feature bears either a time stamp or a history.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DynamicFeatureType">
+		<complexContent>
+			<extension base="gml:AbstractFeatureType">
+				<group ref="gml:dynamicProperties"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="DynamicFeatureCollection" type="gml:DynamicFeatureCollectionType" substitutionGroup="gml:DynamicFeature">
+		<annotation>
+			<documentation>A gml:DynamicFeatureCollection is a feature collection that has a gml:validTime property (i.e. is a snapshot of the feature collection) or which has a gml:history property that contains one or more gml:AbstractTimeSlices each of which contain values of the time varying properties of the feature collection.  Note that the gml:DynamicFeatureCollection may be one of the following:
+1.	A feature collection which consists of static feature members (members do not change in time) but which has properties of the collection object as a whole that do change in time .  
+2.	A feature collection which consists of dynamic feature members (the members are gml:DynamicFeatures) but which also has properties of the collection as a whole that vary in time.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DynamicFeatureCollectionType">
+		<complexContent>
+			<extension base="gml:DynamicFeatureType">
+				<sequence>
+					<element ref="gml:dynamicMembers"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="dynamicMembers" type="gml:DynamicFeatureMemberType"/>
+	<complexType name="DynamicFeatureMemberType">
+		<complexContent>
+			<extension base="gml:AbstractFeatureMemberType">
+				<sequence>
+					<element ref="gml:DynamicFeature" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AssociationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractTimeSlice" type="gml:AbstractTimeSliceType" abstract="true" substitutionGroup="gml:AbstractGML">
+		<annotation>
+			<documentation>To describe an event — an action that occurs at an instant or over an interval of time — GML provides the gml:AbtractTimeSlice element. A timeslice encapsulates the time-varying properties of a dynamic feature -- it shall be extended to represent a time stamped projection of a specific feature. The gml:dataSource property describes how the temporal data was acquired.
+A gml:AbstractTimeSlice instance is a GML object that encapsulates updates of the dynamic—or volatile—properties that reflect some change event; it thus includes only those feature properties that have actually changed due to some process.
+gml:AbstractTimeSlice basically provides a facility for attribute-level time stamping, in contrast to the object-level time stamping of dynamic feature instances. 
+The time slice can thus be viewed as event or process-oriented, whereas a snapshot is more state or structure-oriented. A timeslice has richer causality, whereas a snapshot merely portrays the status of the whole. 
+</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractTimeSliceType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractGMLType">
+				<sequence>
+					<element ref="gml:validTime"/>
+					<element ref="gml:dataSource" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="history" type="gml:HistoryPropertyType">
+		<annotation>
+			<documentation>A generic sequence of events constitute a gml:history of an object.
+The gml:history element contains a set of elements in the substitution group headed by the abstract element gml:AbstractTimeSlice, representing the time-varying properties of interest. The history property of a dynamic feature associates a feature instance with a sequence of time slices (i.e. change events) that encapsulate the evolution of the feature.</documentation>
+		</annotation>
+	</element>
+	<complexType name="HistoryPropertyType">
+		<sequence>
+			<element ref="gml:AbstractTimeSlice" maxOccurs="unbounded"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/feature.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/feature.xsd
new file mode 100644
index 0000000..1892ef6
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/feature.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:feature:3.2.1">feature.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 9.
+A GML feature is a (representation of a) identifiable real-world object in a selected domain of discourse. The feature schema provides a framework for the creation of GML features and feature collections.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryAggregates.xsd"/>
+	<include schemaLocation="temporal.xsd"/>
+	<complexType name="AbstractFeatureType" abstract="true">
+		<annotation>
+			<documentation>The basic feature model is given by the gml:AbstractFeatureType.
+The content model for gml:AbstractFeatureType adds two specific properties suitable for geographic features to the content model defined in gml:AbstractGMLType. 
+The value of the gml:boundedBy property describes an envelope that encloses the entire feature instance, and is primarily useful for supporting rapid searching for features that occur in a particular location. 
+The value of the gml:location property describes the extent, position or relative location of the feature.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGMLType">
+				<sequence>
+					<element ref="gml:boundedBy" minOccurs="0"/>
+					<element ref="gml:location" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractFeature" type="gml:AbstractFeatureType" abstract="true" substitutionGroup="gml:AbstractGML">
+		<annotation>
+			<documentation>This abstract element serves as the head of a substitution group which may contain any elements whose content model is derived from gml:AbstractFeatureType.  This may be used as a variable in the construction of content models.  
+gml:AbstractFeature may be thought of as "anything that is a GML feature" and may be used to define variables or templates in which the value of a GML property is "any feature". This occurs in particular in a GML feature collection where the feature member properties contain one or multiple copies of gml:AbstractFeature respectively.</documentation>
+		</annotation>
+	</element>
+	<complexType name="FeaturePropertyType">
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractFeature"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="boundedBy" type="gml:BoundingShapeType" nillable="true">
+		<annotation>
+			<documentation>This property describes the minimum bounding box or rectangle that encloses the entire feature.</documentation>
+		</annotation>
+	</element>
+	<complexType name="BoundingShapeType">
+		<sequence>
+			<choice>
+				<element ref="gml:Envelope"/>
+				<element ref="gml:Null"/>
+			</choice>
+		</sequence>
+		<attribute name="nilReason" type="gml:NilReasonType"/>
+	</complexType>
+	<element name="EnvelopeWithTimePeriod" type="gml:EnvelopeWithTimePeriodType" substitutionGroup="gml:Envelope">
+		<annotation>
+			<documentation>gml:EnvelopeWithTimePeriod is provided for envelopes that include a temporal extent. It adds two time position properties, gml:beginPosition and gml:endPosition, which describe the extent of a time-envelope.  
+Since gml:EnvelopeWithTimePeriod is assigned to the substitution group headed by gml:Envelope, it may be used whenever gml:Envelope is valid.</documentation>
+		</annotation>
+	</element>
+	<complexType name="EnvelopeWithTimePeriodType">
+		<complexContent>
+			<extension base="gml:EnvelopeType">
+				<sequence>
+					<element name="beginPosition" type="gml:TimePositionType"/>
+					<element name="endPosition" type="gml:TimePositionType"/>
+				</sequence>
+				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="locationName" type="gml:CodeType">
+		<annotation>
+			<documentation>The gml:locationName property element is a convenience property where the text value describes the location of the feature. If the location names are selected from a controlled list, then the list shall be identified in the codeSpace attribute.</documentation>
+		</annotation>
+	</element>
+	<element name="locationReference" type="gml:ReferenceType">
+		<annotation>
+			<documentation>The gml:locationReference property element is a convenience property where the text value referenced by the xlink:href attribute describes the location of the feature.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractFeatureMemberType" abstract="true">
+		<annotation>
+			<documentation>To create a collection of GML features, a property type shall be derived by extension from gml:AbstractFeatureMemberType.
+By default, this abstract property type does not imply any ownership of the features in the collection. The owns attribute of gml:OwnershipAttributeGroup may be used on a property element instance to assert ownership of a feature in the collection. A collection shall not own a feature already owned by another object.</documentation>
+		</annotation>
+		<sequence/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/geometryAggregates.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/geometryAggregates.xsd
new file mode 100644
index 0000000..9ffbdc0
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/geometryAggregates.xsd
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryAggregates:3.2.1">geometryAggregates.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 12.3.
+Geometric aggregates (i.e. instances of a subtype of gml:AbstractGeometricAggregateType) are arbitrary aggregations of geometry elements. They are not assumed to have any additional internal structure and are used to "collect" pieces of geometry of a specified type. Application schemas may use aggregates for features that use multiple geometric objects in their representations.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryPrimitives.xsd"/>
+	<complexType name="AbstractGeometricAggregateType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractGeometryType">
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractGeometricAggregate" type="gml:AbstractGeometricAggregateType" abstract="true" substitutionGroup="gml:AbstractGeometry">
+		<annotation>
+			<documentation>gml:AbstractGeometricAggregate is the abstract head of the substitution group for all geometric aggregates.</documentation>
+		</annotation>
+	</element>
+	<complexType name="MultiGeometryType">
+		<complexContent>
+			<extension base="gml:AbstractGeometricAggregateType">
+				<sequence>
+					<element ref="gml:geometryMember" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:geometryMembers" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="MultiGeometry" type="gml:MultiGeometryType" substitutionGroup="gml:AbstractGeometricAggregate">
+		<annotation>
+			<documentation>gml:MultiGeometry is a collection of one or more GML geometry objects of arbitrary type. 
+The members of the geometric aggregate may be specified either using the "standard" property (gml:geometryMember) or the array property (gml:geometryMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+		</annotation>
+	</element>
+	<element name="geometryMember" type="gml:GeometryPropertyType">
+		<annotation>
+			<documentation>This property element either references a geometry element via the XLink-attributes or contains the geometry element.</documentation>
+		</annotation>
+	</element>
+	<element name="geometryMembers" type="gml:GeometryArrayPropertyType">
+		<annotation>
+			<documentation>This property element contains a list of geometry elements. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+		</annotation>
+	</element>
+	<complexType name="MultiGeometryPropertyType">
+		<annotation>
+			<documentation>A property that has a geometric aggregate as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractGeometricAggregate"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="MultiPointType">
+		<complexContent>
+			<extension base="gml:AbstractGeometricAggregateType">
+				<sequence>
+					<element ref="gml:pointMember" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:pointMembers" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="MultiPoint" type="gml:MultiPointType" substitutionGroup="gml:AbstractGeometricAggregate">
+		<annotation>
+			<documentation>A gml:MultiPoint consists of one or more gml:Points.
+The members of the geometric aggregate may be specified either using the "standard" property (gml:pointMember) or the array property (gml:pointMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+		</annotation>
+	</element>
+	<element name="pointMember" type="gml:PointPropertyType">
+		<annotation>
+			<documentation>This property element either references a Point via the XLink-attributes or contains the Point element.</documentation>
+		</annotation>
+	</element>
+	<element name="pointMembers" type="gml:PointArrayPropertyType">
+		<annotation>
+			<documentation>This property element contains a list of points. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+		</annotation>
+	</element>
+	<complexType name="MultiPointPropertyType">
+		<annotation>
+			<documentation>A property that has a collection of points as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:MultiPoint"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="MultiCurveType">
+		<complexContent>
+			<extension base="gml:AbstractGeometricAggregateType">
+				<sequence>
+					<element ref="gml:curveMember" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:curveMembers" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="MultiCurve" type="gml:MultiCurveType" substitutionGroup="gml:AbstractGeometricAggregate">
+		<annotation>
+			<documentation>A gml:MultiCurve is defined by one or more gml:AbstractCurves.
+The members of the geometric aggregate may be specified either using the "standard" property (gml:curveMember) or the array property (gml:curveMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+		</annotation>
+	</element>
+	<element name="curveMembers" type="gml:CurveArrayPropertyType">
+		<annotation>
+			<documentation>This property element contains a list of curves. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+		</annotation>
+	</element>
+	<complexType name="MultiCurvePropertyType">
+		<annotation>
+			<documentation>A property that has a collection of curves as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:MultiCurve"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="MultiSurfaceType">
+		<complexContent>
+			<extension base="gml:AbstractGeometricAggregateType">
+				<sequence>
+					<element ref="gml:surfaceMember" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:surfaceMembers" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="MultiSurface" type="gml:MultiSurfaceType" substitutionGroup="gml:AbstractGeometricAggregate">
+		<annotation>
+			<documentation>A gml:MultiSurface is defined by one or more gml:AbstractSurfaces.
+The members of the geometric aggregate may be specified either using the "standard" property (gml:surfaceMember) or the array property (gml:surfaceMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+		</annotation>
+	</element>
+	<element name="surfaceMembers" type="gml:SurfaceArrayPropertyType">
+		<annotation>
+			<documentation>This property element contains a list of surfaces. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+		</annotation>
+	</element>
+	<complexType name="MultiSurfacePropertyType">
+		<annotation>
+			<documentation>A property that has a collection of surfaces as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:MultiSurface"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="MultiSolidType">
+		<complexContent>
+			<extension base="gml:AbstractGeometricAggregateType">
+				<sequence>
+					<element ref="gml:solidMember" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:solidMembers" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="MultiSolid" type="gml:MultiSolidType" substitutionGroup="gml:AbstractGeometricAggregate">
+		<annotation>
+			<documentation>A gml:MultiSolid is defined by one or more gml:AbstractSolids.
+The members of the geometric aggregate may be specified either using the "standard" property (gml:solidMember) or the array property (gml:solidMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+		</annotation>
+	</element>
+	<element name="solidMember" type="gml:SolidPropertyType">
+		<annotation>
+			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. A solid element is any element, which is substitutable for gml:AbstractSolid.</documentation>
+		</annotation>
+	</element>
+	<element name="solidMembers" type="gml:SolidArrayPropertyType">
+		<annotation>
+			<documentation>This property element contains a list of solids. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+		</annotation>
+	</element>
+	<complexType name="MultiSolidPropertyType">
+		<annotation>
+			<documentation>A property that has a collection of solids as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:MultiSolid"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/geometryBasic0d1d.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/geometryBasic0d1d.xsd
new file mode 100644
index 0000000..2ac83e3
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/geometryBasic0d1d.xsd
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryBasic0d1d:3.2.1">geometryBasic0d1d.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 10.
+Any geometry element that inherits the semantics of AbstractGeometryType may be viewed as a set of direct positions. 
+All of the classes derived from AbstractGeometryType inherit an optional association to a coordinate reference system. All direct positions shall directly or indirectly be associated with a coordinate reference system. When geometry elements are aggregated in another geometry element (such as a MultiGeometry or GeometricComplex), which already has a coordinate reference system specified, then these elements are assumed to be in that same coordinate reference system unless otherwise specified.
+The geometry model distinguishes geometric primitives, aggregates and complexes. 
+Geometric primitives, i.e. instances of a subtype of AbstractGeometricPrimitiveType, will be open, that is, they will not contain their boundary points; curves will not contain their end points, surfaces will not contain their boundary curves, and solids will not contain their bounding surfaces.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="measures.xsd"/>
+	<complexType name="AbstractGeometryType" abstract="true">
+		<annotation>
+			<documentation>All geometry elements are derived directly or indirectly from this abstract supertype. A geometry element may have an identifying attribute (gml:id), one or more names (elements identifier and name) and a description (elements description and descriptionReference) . It may be associated with a spatial reference system (attribute group gml:SRSReferenceGroup).
+The following rules shall be adhered to:
+-	Every geometry type shall derive from this abstract type.
+-	Every geometry element (i.e. an element of a geometry type) shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGMLType">
+				<attributeGroup ref="gml:SRSReferenceGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<attributeGroup name="SRSReferenceGroup">
+		<annotation>
+			<documentation>The attribute group SRSReferenceGroup is an optional reference to the CRS used by this geometry, with optional additional information to simplify the processing of the coordinates when a more complete definition of the CRS is not needed.
+In general the attribute srsName points to a CRS instance of gml:AbstractCoordinateReferenceSystem. For well-known references it is not required that the CRS description exists at the location the URI points to. 
+If no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of.</documentation>
+		</annotation>
+		<attribute name="srsName" type="anyURI"/>
+		<attribute name="srsDimension" type="positiveInteger"/>
+		<attributeGroup ref="gml:SRSInformationGroup"/>
+	</attributeGroup>
+	<attributeGroup name="SRSInformationGroup">
+		<annotation>
+			<documentation>The attributes uomLabels and axisLabels, defined in the SRSInformationGroup attribute group, are optional additional and redundant information for a CRS to simplify the processing of the coordinate values when a more complete definition of the CRS is not needed. This information shall be the same as included in the complete definition of the CRS, referenced by the srsName attribute. When the srsName attribute is included, either both or neither of the axisLabels and uom [...]
+The attribute axisLabels is an ordered list of labels for all the axes of this CRS. The gml:axisAbbrev value should be used for these axis labels, after spaces and forbidden characters are removed. When the srsName attribute is included, this attribute is optional. When the srsName attribute is omitted, this attribute shall also be omitted.
+The attribute uomLabels is an ordered list of unit of measure (uom) labels for all the axes of this CRS. The value of the string in the gml:catalogSymbol should be used for this uom labels, after spaces and forbidden characters are removed. When the axisLabels attribute is included, this attribute shall also be included. When the axisLabels attribute is omitted, this attribute shall also be omitted.</documentation>
+		</annotation>
+		<attribute name="axisLabels" type="gml:NCNameList"/>
+		<attribute name="uomLabels" type="gml:NCNameList"/>
+	</attributeGroup>
+	<element name="AbstractGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:AbstractGML">
+		<annotation>
+			<documentation>The AbstractGeometry element is the abstract head of the substitution group for all geometry elements of GML. This includes pre-defined and user-defined geometry elements. Any geometry element shall be a direct or indirect extension/restriction of AbstractGeometryType and shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
+		</annotation>
+	</element>
+	<complexType name="GeometryPropertyType">
+		<annotation>
+			<documentation>A geometric property may either be any geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same or another document). Note that either the reference or the contained element shall be given, but not both or none.
+If a feature has a property that takes a geometry element as its value, this is called a geometry property. A generic type for such a geometry property is GeometryPropertyType.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractGeometry"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="GeometryArrayPropertyType">
+		<annotation>
+			<documentation>If a feature has a property which takes an array of geometry elements as its value, this is called a geometry array property. A generic type for such a geometry property is GeometryArrayPropertyType. 
+The elements are always contained inline in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:AbstractGeometry"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="DirectPositionType">
+		<annotation>
+			<documentation>Direct position instances hold the coordinates for a position within some coordinate reference system (CRS). Since direct positions, as data types, will often be included in larger objects (such as geometry elements) that have references to CRS, the srsName attribute will in general be missing, if this particular direct position is included in a larger element with such a reference to a CRS. In this case, the CRS is implicitly assumed to take on the value of the contain [...]
+if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:doubleList">
+				<attributeGroup ref="gml:SRSReferenceGroup"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<element name="pos" type="gml:DirectPositionType"/>
+	<complexType name="DirectPositionListType">
+		<annotation>
+			<documentation>posList instances (and other instances with the content model specified by DirectPositionListType) hold the coordinates for a sequence of direct positions within the same coordinate reference system (CRS).
+if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc. 
+The optional attribute count specifies the number of direct positions in the list. If the attribute count is present then the attribute srsDimension shall be present, too.
+The number of entries in the list is equal to the product of the dimensionality of the coordinate reference system (i.e. it is a derived value of the coordinate reference system definition) and the number of direct positions.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:doubleList">
+				<attributeGroup ref="gml:SRSReferenceGroup"/>
+				<attribute name="count" type="positiveInteger"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<element name="posList" type="gml:DirectPositionListType"/>
+	<group name="geometricPositionGroup">
+		<annotation>
+			<documentation>GML supports two different ways to specify a geometric position: either by a direct position (a data type) or a point (a geometric object).
+pos elements are positions that are "owned" by the geometric primitive encapsulating this geometric position.
+pointProperty elements contain a point that may be referenced from other geometry elements or reference another point defined elsewhere (reuse of existing points).</documentation>
+		</annotation>
+		<choice>
+			<element ref="gml:pos"/>
+			<element ref="gml:pointProperty"/>
+		</choice>
+	</group>
+	<group name="geometricPositionListGroup">
+		<annotation>
+			<documentation>GML supports two different ways to specify a list of geometric positions: either by a sequence of geometric positions (by reusing the group definition) or a sequence of direct positions (element posList). 
+The posList element allows for a compact way to specify the coordinates of the positions, if all positions are represented in the same coordinate reference system.</documentation>
+		</annotation>
+		<choice>
+			<element ref="gml:posList"/>
+			<group ref="gml:geometricPositionGroup" maxOccurs="unbounded"/>
+		</choice>
+	</group>
+	<complexType name="VectorType">
+		<annotation>
+			<documentation>For some applications the components of the position may be adjusted to yield a unit vector.</documentation>
+		</annotation>
+		<simpleContent>
+			<restriction base="gml:DirectPositionType"/>
+		</simpleContent>
+	</complexType>
+	<element name="vector" type="gml:VectorType"/>
+	<complexType name="EnvelopeType">
+		<choice>
+			<sequence>
+				<element name="lowerCorner" type="gml:DirectPositionType"/>
+				<element name="upperCorner" type="gml:DirectPositionType"/>
+			</sequence>
+			<element ref="gml:pos" minOccurs="2" maxOccurs="2">
+				<annotation>
+					<appinfo>deprecated</appinfo>
+				</annotation>
+			</element>
+			<element ref="gml:coordinates"/>
+		</choice>
+		<attributeGroup ref="gml:SRSReferenceGroup"/>
+	</complexType>
+	<element name="Envelope" type="gml:EnvelopeType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>Envelope defines an extent using a pair of positions defining opposite corners in arbitrary dimensions. The first direct position is the "lower corner" (a coordinate position consisting of all the minimal ordinates for each dimension for all points within the envelope), the second one the "upper corner" (a coordinate position consisting of all the maximal ordinates for each dimension for all points within the envelope).
+The use of the properties "coordinates" and "pos" has been deprecated. The explicitly named properties "lowerCorner" and "upperCorner" shall be used instead.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractGeometricPrimitiveType" abstract="true">
+		<annotation>
+			<documentation>gml:AbstractGeometricPrimitiveType is the abstract root type of the geometric primitives. A geometric primitive is a geometric object that is not decomposed further into other primitives in the system. All primitives are oriented in the direction implied by the sequence of their coordinate tuples.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGeometryType"/>
+		</complexContent>
+	</complexType>
+	<element name="AbstractGeometricPrimitive" type="gml:AbstractGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractGeometry">
+		<annotation>
+			<documentation>The AbstractGeometricPrimitive element is the abstract head of the substitution group for all (pre- and user-defined) geometric primitives.</documentation>
+		</annotation>
+	</element>
+	<complexType name="GeometricPrimitivePropertyType">
+		<annotation>
+			<documentation>A property that has a geometric primitive as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractGeometricPrimitive"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<complexType name="PointType">
+		<complexContent>
+			<extension base="gml:AbstractGeometricPrimitiveType">
+				<sequence>
+					<choice>
+						<element ref="gml:pos"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Point" type="gml:PointType" substitutionGroup="gml:AbstractGeometricPrimitive">
+		<annotation>
+			<documentation>A Point is defined by a single coordinate tuple. The direct position of a point is specified by the pos element which is of type DirectPositionType.</documentation>
+		</annotation>
+	</element>
+	<complexType name="PointPropertyType">
+		<annotation>
+			<documentation>A property that has a point as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:Point"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="pointProperty" type="gml:PointPropertyType">
+		<annotation>
+			<documentation>This property element either references a point via the XLink-attributes or contains the point element. pointProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for Point.</documentation>
+		</annotation>
+	</element>
+	<complexType name="PointArrayPropertyType">
+		<annotation>
+			<documentation>gml:PointArrayPropertyType is a container for an array of points. The elements are always contained inline in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:Point"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="AbstractCurveType" abstract="true">
+		<annotation>
+			<documentation>gml:AbstractCurveType is an abstraction of a curve to support the different levels of complexity. The curve may always be viewed as a geometric primitive, i.e. is continuous.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGeometricPrimitiveType"/>
+		</complexContent>
+	</complexType>
+	<element name="AbstractCurve" type="gml:AbstractCurveType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
+		<annotation>
+			<documentation>The AbstractCurve element is the abstract head of the substitution group for all (continuous) curve elements.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CurvePropertyType">
+		<annotation>
+			<documentation>A property that has a curve as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractCurve"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="curveProperty" type="gml:CurvePropertyType">
+		<annotation>
+			<documentation>This property element either references a curve via the XLink-attributes or contains the curve element. curveProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractCurve.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CurveArrayPropertyType">
+		<annotation>
+			<documentation>A container for an array of curves. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:AbstractCurve"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="LineStringType">
+		<complexContent>
+			<extension base="gml:AbstractCurveType">
+				<sequence>
+					<choice>
+						<choice minOccurs="2" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="LineString" type="gml:LineStringType" substitutionGroup="gml:AbstractCurve">
+		<annotation>
+			<documentation>A LineString is a special curve that consists of a single segment with linear interpolation. It is defined by two or more coordinate tuples, with linear interpolation between them. The number of direct positions in the list shall be at least two.</documentation>
+		</annotation>
+	</element>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/geometryBasic2d.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/geometryBasic2d.xsd
new file mode 100644
index 0000000..5781df5
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/geometryBasic2d.xsd
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryBasic2d:3.2.1">geometryBasic2d.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 10.
+			
+			GML is an OGC Standard.
+			Copyright (c) 2007,2010 Open Geospatial Consortium.
+			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryBasic0d1d.xsd"/>
+	<complexType name="AbstractSurfaceType" abstract="true">
+		<annotation>
+			<documentation>gml:AbstractSurfaceType is an abstraction of a surface to support the different levels of complexity. A surface is always a continuous region of a plane.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGeometricPrimitiveType"/>
+		</complexContent>
+	</complexType>
+	<element name="AbstractSurface" type="gml:AbstractSurfaceType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
+		<annotation>
+			<documentation>The AbstractSurface element is the abstract head of the substitution group for all (continuous) surface elements.</documentation>
+		</annotation>
+	</element>
+	<complexType name="SurfacePropertyType">
+		<annotation>
+			<documentation>A property that has a surface as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractSurface"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="surfaceProperty" type="gml:SurfacePropertyType">
+		<annotation>
+			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. surfaceProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSurface.</documentation>
+		</annotation>
+	</element>
+	<complexType name="SurfaceArrayPropertyType">
+		<annotation>
+			<documentation>gml:SurfaceArrayPropertyType is a container for an array of surfaces. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:AbstractSurface"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="PolygonType">
+		<complexContent>
+			<extension base="gml:AbstractSurfaceType">
+				<sequence>
+					<element ref="gml:exterior" minOccurs="0"/>
+					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Polygon" type="gml:PolygonType" substitutionGroup="gml:AbstractSurface">
+		<annotation>
+			<documentation>A Polygon is a special surface that is defined by a single surface patch (see D.3.6). The boundary of this patch is coplanar and the polygon uses planar interpolation in its interior. 
+The elements exterior and interior describe the surface boundary of the polygon.</documentation>
+		</annotation>
+	</element>
+	<element name="exterior" type="gml:AbstractRingPropertyType">
+		<annotation>
+			<documentation>A boundary of a surface consists of a number of rings. In the normal 2D case, one of these rings is distinguished as being the exterior boundary. In a general manifold this is not always possible, in which case all boundaries shall be listed as interior boundaries, and the exterior will be empty.</documentation>
+		</annotation>
+	</element>
+	<element name="interior" type="gml:AbstractRingPropertyType">
+		<annotation>
+			<documentation>A boundary of a surface consists of a number of rings. The "interior" rings separate the surface / surface patch from the area enclosed by the rings.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractRingType" abstract="true">
+		<sequence/>
+	</complexType>
+	<element name="AbstractRing" type="gml:AbstractRingType" abstract="true" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>An abstraction of a ring to support surface boundaries of different complexity.
+The AbstractRing element is the abstract head of the substituition group for all closed boundaries of a surface patch.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractRingPropertyType">
+		<annotation>
+			<documentation>A property with the content model of gml:AbstractRingPropertyType encapsulates a ring to represent the surface boundary property of a surface.</documentation>
+		</annotation>
+		<sequence>
+			<element ref="gml:AbstractRing"/>
+		</sequence>
+	</complexType>
+	<complexType name="LinearRingType">
+		<complexContent>
+			<extension base="gml:AbstractRingType">
+				<sequence>
+					<choice>
+						<choice minOccurs="4" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="LinearRing" type="gml:LinearRingType" substitutionGroup="gml:AbstractRing">
+		<annotation>
+			<documentation>A LinearRing is defined by four or more coordinate tuples, with linear interpolation between them; the first and last coordinates shall be coincident. The number of direct positions in the list shall be at least four.</documentation>
+		</annotation>
+	</element>
+	<complexType name="LinearRingPropertyType">
+		<annotation>
+			<documentation>A property with the content model of gml:LinearRingPropertyType encapsulates a linear ring to represent a component of a surface boundary.</documentation>
+		</annotation>
+		<sequence>
+			<element ref="gml:LinearRing"/>
+		</sequence>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/geometryComplexes.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/geometryComplexes.xsd
new file mode 100644
index 0000000..de4f945
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/geometryComplexes.xsd
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryComplexes:3.2.1">geometryComplexes.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 12.2.
+Geometric complexes (i.e. instances of gml:GeometricComplexType) are closed collections of geometric primitives, i.e. they will contain their boundaries. 
+A geometric complex (gml:GeometricComplex) is defined by ISO 19107:2003, 6.6.1 as "a set of primitive geometric objects (in a common coordinate system) whose interiors are disjoint. Further, if a primitive is in a geometric complex, then there exists a set of primitives in that complex whose point-wise union is the boundary of this first primitive."
+A geometric composite (gml:CompositeCurve, gml:CompositeSurface and gml:CompositeSolid) represents a geometric complex with an underlying core geometry that is isomorphic to a primitive, i.e. it can be viewed as a primitive and as a complex. See ISO 19107:2003, 6.1 and 6.6.3 for more details on the nature of composite geometries.
+Geometric complexes and composites are intended to be used in application schemas where the sharing of geometry is important.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryAggregates.xsd"/>
+	<complexType name="GeometricComplexType">
+		<complexContent>
+			<extension base="gml:AbstractGeometryType">
+				<sequence>
+					<element name="element" type="gml:GeometricPrimitivePropertyType" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="GeometricComplex" type="gml:GeometricComplexType" substitutionGroup="gml:AbstractGeometry"/>
+	<complexType name="GeometricComplexPropertyType">
+		<annotation>
+			<documentation>A property that has a geometric complex as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<choice>
+				<element ref="gml:GeometricComplex"/>
+				<element ref="gml:CompositeCurve"/>
+				<element ref="gml:CompositeSurface"/>
+				<element ref="gml:CompositeSolid"/>
+			</choice>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<complexType name="CompositeCurveType">
+		<complexContent>
+			<extension base="gml:AbstractCurveType">
+				<sequence>
+					<element ref="gml:curveMember" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="CompositeCurve" type="gml:CompositeCurveType" substitutionGroup="gml:AbstractCurve">
+		<annotation>
+			<documentation>A gml:CompositeCurve is represented by a sequence of (orientable) curves such that each curve in the sequence terminates at the start point of the subsequent curve in the list. 
+curveMember references or contains inline one curve in the composite curve. 
+The curves are contiguous, the collection of curves is ordered. Therefore, if provided, the aggregationType attribute shall have the value "sequence".</documentation>
+		</annotation>
+	</element>
+	<complexType name="CompositeSurfaceType">
+		<complexContent>
+			<extension base="gml:AbstractSurfaceType">
+				<sequence>
+					<element ref="gml:surfaceMember" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="CompositeSurface" type="gml:CompositeSurfaceType" substitutionGroup="gml:AbstractSurface">
+		<annotation>
+			<documentation>A gml:CompositeSurface is represented by a set of orientable surfaces. It is geometry type with all the geometric properties of a (primitive) surface. Essentially, a composite surface is a collection of surfaces that join in pairs on common boundary curves and which, when considered as a whole, form a single surface.
+surfaceMember references or contains inline one surface in the composite surface. 
+The surfaces are contiguous.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CompositeSolidType">
+		<complexContent>
+			<extension base="gml:AbstractSolidType">
+				<sequence>
+					<element ref="gml:solidMember" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="CompositeSolid" type="gml:CompositeSolidType" substitutionGroup="gml:AbstractSolid">
+		<annotation>
+			<documentation>gml:CompositeSolid implements ISO 19107 GM_CompositeSolid (see ISO 19107:2003, 6.6.7) as specified in D.2.3.6. 
+A gml:CompositeSolid is represented by a set of orientable surfaces. It is a geometry type with all the geometric properties of a (primitive) solid. Essentially, a composite solid is a collection of solids that join in pairs on common boundary surfaces and which, when considered as a whole, form a single solid. 
+solidMember references or contains one solid in the composite solid. The solids are contiguous.</documentation>
+		</annotation>
+	</element>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/geometryPrimitives.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/geometryPrimitives.xsd
new file mode 100644
index 0000000..9cbd52c
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/geometryPrimitives.xsd
@@ -0,0 +1,846 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryPrimitives:3.2.1">geometryPrimitives.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 11.
+Beside the "simple" geometric primitives specified in the previous Clause, this Clause specifies additional primitives to describe real world situations which require a more expressive geometry model.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryBasic2d.xsd"/>
+	<complexType name="CurveType">
+		<complexContent>
+			<extension base="gml:AbstractCurveType">
+				<sequence>
+					<element ref="gml:segments"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Curve" type="gml:CurveType" substitutionGroup="gml:AbstractCurve">
+		<annotation>
+			<documentation>A curve is a 1-dimensional primitive. Curves are continuous, connected, and have a measurable length in terms of the coordinate system. 
+A curve is composed of one or more curve segments. Each curve segment within a curve may be defined using a different interpolation method. The curve segments are connected to one another, with the end point of each segment except the last being the start point of the next segment in the segment list.
+The orientation of the curve is positive.
+The element segments encapsulates the segments of the curve.</documentation>
+		</annotation>
+	</element>
+	<complexType name="OrientableCurveType">
+		<complexContent>
+			<extension base="gml:AbstractCurveType">
+				<sequence>
+					<element ref="gml:baseCurve"/>
+				</sequence>
+				<attribute name="orientation" type="gml:SignType" default="+"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="baseCurve" type="gml:CurvePropertyType">
+		<annotation>
+			<documentation>The property baseCurve references or contains the base curve, i.e. it either references the base curve via the XLink-attributes or contains the curve element. A curve element is any element which is substitutable for AbstractCurve. The base curve has positive orientation.</documentation>
+		</annotation>
+	</element>
+	<element name="OrientableCurve" type="gml:OrientableCurveType" substitutionGroup="gml:AbstractCurve">
+		<annotation>
+			<documentation>OrientableCurve consists of a curve and an orientation. If the orientation is "+", then the OrientableCurve is identical to the baseCurve. If the orientation is "-", then the OrientableCurve is related to another AbstractCurve with a parameterization that reverses the sense of the curve traversal.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractCurveSegmentType" abstract="true">
+		<attribute name="numDerivativesAtStart" type="integer" default="0"/>
+		<attribute name="numDerivativesAtEnd" type="integer" default="0"/>
+		<attribute name="numDerivativeInterior" type="integer" default="0"/>
+	</complexType>
+	<element name="AbstractCurveSegment" type="gml:AbstractCurveSegmentType" abstract="true" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>A curve segment defines a homogeneous segment of a curve.
+The attributes numDerivativesAtStart, numDerivativesAtEnd and numDerivativesInterior specify the type of continuity as specified in ISO 19107:2003, 6.4.9.3.
+The AbstractCurveSegment element is the abstract head of the substituition group for all curve segment elements, i.e. continuous segments of the same interpolation mechanism.
+All curve segments shall have an attribute interpolation with type gml:CurveInterpolationType specifying the curve interpolation mechanism used for this segment. This mechanism uses the control points and control parameters to determine the position of this curve segment.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CurveSegmentArrayPropertyType">
+		<annotation>
+			<documentation>gml:CurveSegmentArrayPropertyType is a container for an array of curve segments.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:AbstractCurveSegment"/>
+		</sequence>
+	</complexType>
+	<element name="segments" type="gml:CurveSegmentArrayPropertyType">
+		<annotation>
+			<documentation>This property element contains a list of curve segments. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+		</annotation>
+	</element>
+	<simpleType name="CurveInterpolationType">
+		<annotation>
+			<documentation>gml:CurveInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="linear"/>
+			<enumeration value="geodesic"/>
+			<enumeration value="circularArc3Points"/>
+			<enumeration value="circularArc2PointWithBulge"/>
+			<enumeration value="circularArcCenterPointWithRadius"/>
+			<enumeration value="elliptical"/>
+			<enumeration value="clothoid"/>
+			<enumeration value="conic"/>
+			<enumeration value="polynomialSpline"/>
+			<enumeration value="cubicSpline"/>
+			<enumeration value="rationalSpline"/>
+		</restriction>
+	</simpleType>
+	<complexType name="LineStringSegmentType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<choice>
+						<choice minOccurs="2" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="linear"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="LineStringSegment" type="gml:LineStringSegmentType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>A LineStringSegment is a curve segment that is defined by two or more control points including the start and end point, with linear interpolation between them.
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ArcStringType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<choice>
+						<choice minOccurs="3" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
+				<attribute name="numArc" type="integer"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="ArcString" type="gml:ArcStringType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>An ArcString is a curve segment that uses three-point circular arc interpolation ("circularArc3Points"). The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be 2 * numArc + 1.
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ArcType">
+		<complexContent>
+			<restriction base="gml:ArcStringType">
+				<sequence>
+					<choice>
+						<choice minOccurs="3" maxOccurs="3">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+				</sequence>
+				<attribute name="numArc" type="integer" fixed="1"/>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<element name="Arc" type="gml:ArcType" substitutionGroup="gml:ArcString">
+		<annotation>
+			<documentation>An Arc is an arc string with only one arc unit, i.e. three control points including the start and end point. As arc is an arc string consisting of a single arc, the attribute "numArc" is fixed to "1".</documentation>
+		</annotation>
+	</element>
+	<complexType name="CircleType">
+		<complexContent>
+			<extension base="gml:ArcType"/>
+		</complexContent>
+	</complexType>
+	<element name="Circle" type="gml:CircleType" substitutionGroup="gml:Arc">
+		<annotation>
+			<documentation>A Circle is an arc whose ends coincide to form a simple closed loop. The three control points shall be distinct non-co-linear points for the circle to be unambiguously defined. The arc is simply extended past the third control point until the first control point is encountered.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ArcStringByBulgeType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<choice>
+						<choice minOccurs="2" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+					<element name="bulge" type="double" maxOccurs="unbounded"/>
+					<element name="normal" type="gml:VectorType" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc2PointWithBulge"/>
+				<attribute name="numArc" type="integer"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="ArcStringByBulge" type="gml:ArcStringByBulgeType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>This variant of the arc computes the mid points of the arcs instead of storing the coordinates directly. The control point sequence consists of the start and end points of each arc plus the bulge (see ISO 19107:2003, 6.4.17.2). The normal is a vector normal (perpendicular) to the chord of the arc (see ISO 19107:2003, 6.4.17.4).
+The interpolation is fixed as "circularArc2PointWithBulge".
+The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be numArc + 1.
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ArcByBulgeType">
+		<complexContent>
+			<restriction base="gml:ArcStringByBulgeType">
+				<sequence>
+					<choice>
+						<choice minOccurs="2" maxOccurs="2">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+					<element name="bulge" type="double"/>
+					<element name="normal" type="gml:VectorType"/>
+				</sequence>
+				<attribute name="numArc" type="integer" fixed="1"/>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<element name="ArcByBulge" type="gml:ArcByBulgeType" substitutionGroup="gml:ArcStringByBulge">
+		<annotation>
+			<documentation>An ArcByBulge is an arc string with only one arc unit, i.e. two control points, one bulge and one normal vector.
+As arc is an arc string consisting of a single arc, the attribute "numArc" is fixed to "1".</documentation>
+		</annotation>
+	</element>
+	<complexType name="ArcByCenterPointType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<choice>
+						<choice>
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+					<element name="radius" type="gml:LengthType"/>
+					<element name="startAngle" type="gml:AngleType" minOccurs="0"/>
+					<element name="endAngle" type="gml:AngleType" minOccurs="0"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArcCenterPointWithRadius"/>
+				<attribute name="numArc" type="integer" use="required" fixed="1"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="ArcByCenterPoint" type="gml:ArcByCenterPointType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>This variant of the arc requires that the points on the arc shall be computed instead of storing the coordinates directly. The single control point is the center point of the arc plus the radius and the bearing at start and end. This representation can be used only in 2D.
+The element radius specifies the radius of the arc.
+The element startAngle specifies the bearing of the arc at the start.
+The element endAngle specifies the bearing of the arc at the end.
+The interpolation is fixed as "circularArcCenterPointWithRadius".
+Since this type describes always a single arc, the attribute "numArc" is fixed to "1".
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CircleByCenterPointType">
+		<complexContent>
+			<restriction base="gml:ArcByCenterPointType">
+				<sequence>
+					<choice>
+						<choice>
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+					<element name="radius" type="gml:LengthType"/>
+				</sequence>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<element name="CircleByCenterPoint" type="gml:CircleByCenterPointType" substitutionGroup="gml:ArcByCenterPoint">
+		<annotation>
+			<documentation>A gml:CircleByCenterPoint is an gml:ArcByCenterPoint with identical start and end angle to form a full circle. Again, this representation can be used only in 2D.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CubicSplineType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<choice>
+						<choice minOccurs="2" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+					<element name="vectorAtStart" type="gml:VectorType"/>
+					<element name="vectorAtEnd" type="gml:VectorType"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="cubicSpline"/>
+				<attribute name="degree" type="integer" fixed="3"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="CubicSpline" type="gml:CubicSplineType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>The number of control points shall be at least three.
+vectorAtStart is the unit tangent vector at the start point of the spline. vectorAtEnd is the unit tangent vector at the end point of the spline. Only the direction of the vectors shall be used to determine the shape of the cubic spline, not their length.
+interpolation is fixed as "cubicSpline".
+degree shall be the degree of the polynomial used for the interpolation in this spline. Therefore the degree for a cubic spline is fixed to "3".
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="BSplineType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<choice>
+						<choice minOccurs="0" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+					<element name="degree" type="nonNegativeInteger"/>
+					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" default="polynomialSpline"/>
+				<attribute name="isPolynomial" type="boolean"/>
+				<attribute name="knotType" type="gml:KnotTypesType"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="BSpline" type="gml:BSplineType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>A B-Spline is a piecewise parametric polynomial or rational curve described in terms of control points and basis functions as specified in ISO 19107:2003, 6.4.30. Therefore, interpolation may be either "polynomialSpline" or "rationalSpline" depending on the interpolation type; default is "polynomialSpline".
+degree shall be the degree of the polynomial used for interpolation in this spline.
+knot shall be the sequence of distinct knots used to define the spline basis functions (see ISO 19107:2003, 6.4.26.2).
+The attribute isPolynomial shall be set to "true" if this is a polynomial spline (see ISO 19107:2003, 6.4.30.5).
+The attribute knotType shall provide the type of knot distribution used in defining this spline (see ISO 19107:2003, 6.4.30.4).
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="KnotType">
+		<sequence>
+			<element name="value" type="double"/>
+			<element name="multiplicity" type="nonNegativeInteger"/>
+			<element name="weight" type="double"/>
+		</sequence>
+	</complexType>
+	<complexType name="KnotPropertyType">
+		<annotation>
+			<documentation>gml:KnotPropertyType encapsulates a knot to use it in a geometric type.</documentation>
+		</annotation>
+		<sequence>
+			<element name="Knot" type="gml:KnotType">
+				<annotation>
+					<documentation>A knot is a breakpoint on a piecewise spline curve.
+value is the value of the parameter at the knot of the spline (see ISO 19107:2003, 6.4.24.2).
+multiplicity is the multiplicity of this knot used in the definition of the spline (with the same weight).
+weight is the value of the averaging weight used for this knot of the spline.</documentation>
+				</annotation>
+			</element>
+		</sequence>
+	</complexType>
+	<simpleType name="KnotTypesType">
+		<annotation>
+			<documentation>This enumeration type specifies values for the knots' type (see ISO 19107:2003, 6.4.25).</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="uniform"/>
+			<enumeration value="quasiUniform"/>
+			<enumeration value="piecewiseBezier"/>
+		</restriction>
+	</simpleType>
+	<complexType name="BezierType">
+		<complexContent>
+			<restriction base="gml:BSplineType">
+				<sequence>
+					<choice>
+						<choice minOccurs="0" maxOccurs="unbounded">
+							<element ref="gml:pos"/>
+							<element ref="gml:pointProperty"/>
+							<element ref="gml:pointRep"/>
+						</choice>
+						<element ref="gml:posList"/>
+						<element ref="gml:coordinates"/>
+					</choice>
+					<element name="degree" type="nonNegativeInteger"/>
+					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="2"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="polynomialSpline"/>
+				<attribute name="isPolynomial" type="boolean" fixed="true"/>
+				<attribute name="knotType" type="gml:KnotTypesType" use="prohibited"/>
+			</restriction>
+		</complexContent>
+	</complexType>
+	<element name="Bezier" type="gml:BezierType" substitutionGroup="gml:BSpline">
+		<annotation>
+			<documentation>Bezier curves are polynomial splines that use Bezier or Bernstein polynomials for interpolation purposes. It is a special case of the B-Spline curve with two knots.
+degree shall be the degree of the polynomial used for interpolation in this spline.
+knot shall be the sequence of distinct knots used to define the spline basis functions.
+interpolation is fixed as "polynomialSpline".
+isPolynomial is fixed as "true".
+knotType is not relevant for Bezier curve segments.
+</documentation>
+		</annotation>
+	</element>
+	<complexType name="OffsetCurveType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<element name="offsetBase" type="gml:CurvePropertyType"/>
+					<element name="distance" type="gml:LengthType"/>
+					<element name="refDirection" type="gml:VectorType" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="OffsetCurve" type="gml:OffsetCurveType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>An offset curve is a curve at a constant distance from the basis curve. offsetBase is the base curve from which this curve is defined as an offset. distance and refDirection have the same meaning as specified in ISO 19107:2003, 6.4.23.
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AffinePlacementType">
+		<sequence>
+			<element name="location" type="gml:DirectPositionType"/>
+			<element name="refDirection" type="gml:VectorType" maxOccurs="unbounded"/>
+			<element name="inDimension" type="positiveInteger"/>
+			<element name="outDimension" type="positiveInteger"/>
+		</sequence>
+	</complexType>
+	<element name="AffinePlacement" type="gml:AffinePlacementType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>location, refDirection, inDimension and outDimension have the same meaning as specified in ISO 19107:2003, 6.4.21.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ClothoidType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<sequence>
+					<element name="refLocation">
+						<complexType>
+							<sequence>
+								<element ref="gml:AffinePlacement"/>
+							</sequence>
+						</complexType>
+					</element>
+					<element name="scaleFactor" type="decimal"/>
+					<element name="startParameter" type="double"/>
+					<element name="endParameter" type="double"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="clothoid"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Clothoid" type="gml:ClothoidType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>A clothoid, or Cornu's spiral, is plane curve whose curvature is a fixed function of its length.
+refLocation, startParameter, endParameter and scaleFactor have the same meaning as specified in ISO 19107:2003, 6.4.22.
+interpolation is fixed as "clothoid".
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="GeodesicStringType">
+		<complexContent>
+			<extension base="gml:AbstractCurveSegmentType">
+				<choice>
+					<element ref="gml:posList"/>
+					<group ref="gml:geometricPositionGroup" minOccurs="2" maxOccurs="unbounded"/>
+				</choice>
+				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="geodesic"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="GeodesicString" type="gml:GeodesicStringType" substitutionGroup="gml:AbstractCurveSegment">
+		<annotation>
+			<documentation>A sequence of geodesic segments. 
+The number of control points shall be at least two.
+interpolation is fixed as "geodesic".
+The content model follows the general pattern for the encoding of curve segments.</documentation>
+		</annotation>
+	</element>
+	<complexType name="GeodesicType">
+		<complexContent>
+			<extension base="gml:GeodesicStringType"/>
+		</complexContent>
+	</complexType>
+	<element name="Geodesic" type="gml:GeodesicType" substitutionGroup="gml:GeodesicString"/>
+	<complexType name="SurfaceType">
+		<complexContent>
+			<extension base="gml:AbstractSurfaceType">
+				<sequence>
+					<element ref="gml:patches"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Surface" type="gml:SurfaceType" substitutionGroup="gml:AbstractSurface">
+		<annotation>
+			<documentation>A Surface is a 2-dimensional primitive and is composed of one or more surface patches as specified in ISO 19107:2003, 6.3.17.1. The surface patches are connected to one another.
+patches encapsulates the patches of the surface.</documentation>
+		</annotation>
+	</element>
+	<complexType name="OrientableSurfaceType">
+		<complexContent>
+			<extension base="gml:AbstractSurfaceType">
+				<sequence>
+					<element ref="gml:baseSurface"/>
+				</sequence>
+				<attribute name="orientation" type="gml:SignType" default="+"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="baseSurface" type="gml:SurfacePropertyType">
+		<annotation>
+			<documentation>The property baseSurface references or contains the base surface. The property baseSurface either references the base surface via the XLink-attributes or contains the surface element. A surface element is any element which is substitutable for gml:AbstractSurface. The base surface has positive orientation.</documentation>
+		</annotation>
+	</element>
+	<element name="OrientableSurface" type="gml:OrientableSurfaceType" substitutionGroup="gml:AbstractSurface">
+		<annotation>
+			<documentation>OrientableSurface consists of a surface and an orientation. If the orientation is "+", then the OrientableSurface is identical to the baseSurface. If the orientation is "-", then the OrientableSurface is a reference to a gml:AbstractSurface with an up-normal that reverses the direction for this OrientableSurface, the sense of "the top of the surface".</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractSurfacePatchType" abstract="true"/>
+	<element name="AbstractSurfacePatch" type="gml:AbstractSurfacePatchType" abstract="true">
+		<annotation>
+			<documentation>A surface patch defines a homogenuous portion of a surface. 
+The AbstractSurfacePatch element is the abstract head of the substituition group for all surface patch elements describing a continuous portion of a surface.
+All surface patches shall have an attribute interpolation (declared in the types derived from gml:AbstractSurfacePatchType) specifying the interpolation mechanism used for the patch using gml:SurfaceInterpolationType.</documentation>
+		</annotation>
+	</element>
+	<complexType name="SurfacePatchArrayPropertyType">
+		<annotation>
+			<documentation>gml:SurfacePatchArrayPropertyType is a container for a sequence of surface patches.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:AbstractSurfacePatch"/>
+		</sequence>
+	</complexType>
+	<element name="patches" type="gml:SurfacePatchArrayPropertyType">
+		<annotation>
+			<documentation>The patches property element contains the sequence of surface patches. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+		</annotation>
+	</element>
+	<simpleType name="SurfaceInterpolationType">
+		<annotation>
+			<documentation>gml:SurfaceInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="none"/>
+			<enumeration value="planar"/>
+			<enumeration value="spherical"/>
+			<enumeration value="elliptical"/>
+			<enumeration value="conic"/>
+			<enumeration value="tin"/>
+			<enumeration value="parametricCurve"/>
+			<enumeration value="polynomialSpline"/>
+			<enumeration value="rationalSpline"/>
+			<enumeration value="triangulatedSpline"/>
+		</restriction>
+	</simpleType>
+	<complexType name="PolygonPatchType">
+		<complexContent>
+			<extension base="gml:AbstractSurfacePatchType">
+				<sequence>
+					<element ref="gml:exterior" minOccurs="0"/>
+					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="PolygonPatch" type="gml:PolygonPatchType" substitutionGroup="gml:AbstractSurfacePatch">
+		<annotation>
+			<documentation>A gml:PolygonPatch is a surface patch that is defined by a set of boundary curves and an underlying surface to which these curves adhere. The curves shall be coplanar and the polygon uses planar interpolation in its interior. 
+interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TriangleType">
+		<complexContent>
+			<extension base="gml:AbstractSurfacePatchType">
+				<sequence>
+					<element ref="gml:exterior"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Triangle" type="gml:TriangleType" substitutionGroup="gml:AbstractSurfacePatch">
+		<annotation>
+			<documentation>gml:Triangle represents a triangle as a surface patch with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring shall be four.
+The ring (element exterior) shall be a gml:LinearRing and shall form a triangle, the first and the last position shall be coincident.
+interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
+		</annotation>
+	</element>
+	<complexType name="RectangleType">
+		<complexContent>
+			<extension base="gml:AbstractSurfacePatchType">
+				<sequence>
+					<element ref="gml:exterior"/>
+				</sequence>
+				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Rectangle" type="gml:RectangleType" substitutionGroup="gml:AbstractSurfacePatch">
+		<annotation>
+			<documentation>gml:Rectangle represents a rectangle as a surface patch with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring shall be five.
+The ring (element exterior) shall be a gml:LinearRing and shall form a rectangle; the first and the last position shall be coincident.
+interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
+		</annotation>
+	</element>
+	<complexType name="RingType">
+		<complexContent>
+			<extension base="gml:AbstractRingType">
+				<sequence>
+					<element ref="gml:curveMember" maxOccurs="unbounded"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Ring" type="gml:RingType" substitutionGroup="gml:AbstractRing">
+		<annotation>
+			<documentation>A ring is used to represent a single connected component of a surface boundary as specified in ISO 19107:2003, 6.3.6.
+Every gml:curveMember references or contains one curve, i.e. any element which is substitutable for gml:AbstractCurve. In the context of a ring, the curves describe the boundary of the surface. The sequence of curves shall be contiguous and connected in a cycle.
+If provided, the aggregationType attribute shall have the value "sequence".</documentation>
+		</annotation>
+	</element>
+	<element name="curveMember" type="gml:CurvePropertyType"/>
+	<complexType name="RingPropertyType">
+		<annotation>
+			<documentation>A property with the content model of gml:RingPropertyType encapsulates a ring to represent a component of a surface boundary.</documentation>
+		</annotation>
+		<sequence>
+			<element ref="gml:Ring"/>
+		</sequence>
+	</complexType>
+	<group name="PointGrid">
+		<annotation>
+			<documentation>A gml:PointGrid group contains or references points or positions which are organised into sequences or grids. All rows shall have the same number of positions (columns).</documentation>
+		</annotation>
+		<sequence>
+			<element name="rows">
+				<complexType>
+					<sequence>
+						<element name="Row" maxOccurs="unbounded">
+							<complexType>
+								<group ref="gml:geometricPositionListGroup"/>
+							</complexType>
+						</element>
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</group>
+	<complexType name="AbstractParametricCurveSurfaceType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractSurfacePatchType">
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractParametricCurveSurface" type="gml:AbstractParametricCurveSurfaceType" abstract="true" substitutionGroup="gml:AbstractSurfacePatch">
+		<annotation>
+			<documentation>The element provides a substitution group head for the surface patches based on parametric curves. All properties are specified in the derived subtypes. All derived subtypes shall conform to the constraints specified in ISO 19107:2003, 6.4.40.
+If provided, the aggregationType attribute shall have the value "set".</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractGriddedSurfaceType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractParametricCurveSurfaceType">
+				<sequence>
+					<group ref="gml:PointGrid"/>
+				</sequence>
+				<attribute name="rows" type="integer"/>
+				<attribute name="columns" type="integer"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractGriddedSurface" type="gml:AbstractGriddedSurfaceType" abstract="true" substitutionGroup="gml:AbstractParametricCurveSurface">
+		<annotation>
+			<documentation>if provided, rows gives the number of rows, columns the number of columns in the parameter grid. The parameter grid is represented by an instance of the gml:PointGrid group.
+The element provides a substitution group head for the surface patches based on a grid. All derived subtypes shall conform to the constraints specified in ISO 19107:2003, 6.4.41.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ConeType">
+		<complexContent>
+			<extension base="gml:AbstractGriddedSurfaceType">
+				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
+				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Cone" type="gml:ConeType" substitutionGroup="gml:AbstractGriddedSurface"/>
+	<complexType name="CylinderType">
+		<complexContent>
+			<extension base="gml:AbstractGriddedSurfaceType">
+				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
+				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Cylinder" type="gml:CylinderType" substitutionGroup="gml:AbstractGriddedSurface"/>
+	<complexType name="SphereType">
+		<complexContent>
+			<extension base="gml:AbstractGriddedSurfaceType">
+				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
+				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Sphere" type="gml:SphereType" substitutionGroup="gml:AbstractGriddedSurface"/>
+	<element name="PolyhedralSurface" type="gml:SurfaceType" substitutionGroup="gml:Surface">
+		<annotation>
+			<documentation>A polyhedral surface is a surface composed of polygon patches connected along their common boundary curves. This differs from the surface type only in the restriction on the types of surface patches acceptable.
+polygonPatches encapsulates the polygon patches of the polyhedral surface.</documentation>
+		</annotation>
+	</element>
+	<element name="TriangulatedSurface" type="gml:SurfaceType" substitutionGroup="gml:Surface">
+		<annotation>
+			<documentation>A triangulated surface is a polyhedral surface that is composed only of triangles. There is no restriction on how the triangulation is derived.
+trianglePatches encapsulates the triangles of the triangulated surface.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TinType">
+		<complexContent>
+			<extension base="gml:SurfaceType">
+				<sequence>
+					<element name="stopLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded"/>
+					<element name="breakLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded"/>
+					<element name="maxLength" type="gml:LengthType"/>
+					<element name="controlPoint">
+						<complexType>
+							<choice>
+								<element ref="gml:posList"/>
+								<group ref="gml:geometricPositionGroup" minOccurs="3" maxOccurs="unbounded"/>
+							</choice>
+						</complexType>
+					</element>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Tin" type="gml:TinType" substitutionGroup="gml:TriangulatedSurface">
+		<annotation>
+			<documentation>A tin is a triangulated surface that uses the Delauny algorithm or a similar algorithm complemented with consideration of stoplines (stopLines), breaklines (breakLines), and maximum length of triangle sides (maxLength). controlPoint shall contain a set of the positions (three or more) used as posts for this TIN (corners of the triangles in the TIN). See ISO 19107:2003, 6.4.39 for details.</documentation>
+		</annotation>
+	</element>
+	<complexType name="LineStringSegmentArrayPropertyType">
+		<annotation>
+			<documentation>gml:LineStringSegmentArrayPropertyType provides a container for line strings.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:LineStringSegment"/>
+		</sequence>
+	</complexType>
+	<complexType name="AbstractSolidType">
+		<annotation>
+			<documentation>gml:AbstractSolidType is an abstraction of a solid to support the different levels of complexity. The solid may always be viewed as a geometric primitive, i.e. is contiguous.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:AbstractGeometricPrimitiveType"/>
+		</complexContent>
+	</complexType>
+	<element name="AbstractSolid" type="gml:AbstractSolidType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
+		<annotation>
+			<documentation>The AbstractSolid element is the abstract head of the substituition group for all (continuous) solid elements.</documentation>
+		</annotation>
+	</element>
+	<complexType name="SolidPropertyType">
+		<annotation>
+			<documentation>A property that has a solid as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractSolid"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="solidProperty" type="gml:SolidPropertyType">
+		<annotation>
+			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. solidProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSolid.</documentation>
+		</annotation>
+	</element>
+	<complexType name="SolidArrayPropertyType">
+		<annotation>
+			<documentation>gml:SolidArrayPropertyType is a container for an array of solids. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements is not supported.</documentation>
+		</annotation>
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<element ref="gml:AbstractSolid"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="SolidType">
+		<complexContent>
+			<extension base="gml:AbstractSolidType">
+				<sequence>
+					<element name="exterior" type="gml:ShellPropertyType" minOccurs="0"/>
+					<element name="interior" type="gml:ShellPropertyType" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Solid" type="gml:SolidType" substitutionGroup="gml:AbstractSolid">
+		<annotation>
+			<documentation>A solid is the basis for 3-dimensional geometry. The extent of a solid is defined by the boundary surfaces as specified in ISO 19107:2003, 6.3.18. exterior specifies the outer boundary, interior the inner boundary of the solid.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ShellType">
+		<sequence>
+			<element ref="gml:surfaceMember" maxOccurs="unbounded"/>
+		</sequence>
+		<attributeGroup ref="gml:AggregationAttributeGroup"/>
+	</complexType>
+	<element name="Shell" type="gml:ShellType" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>A shell is used to represent a single connected component of a solid boundary as specified in ISO 19107:2003, 6.3.8.
+Every gml:surfaceMember references or contains one surface, i.e. any element which is substitutable for gml:AbstractSurface. In the context of a shell, the surfaces describe the boundary of the solid. 
+If provided, the aggregationType attribute shall have the value "set".
+</documentation>
+		</annotation>
+	</element>
+	<element name="surfaceMember" type="gml:SurfacePropertyType">
+		<annotation>
+			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element, which is substitutable for gml:AbstractSurface.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ShellPropertyType">
+		<annotation>
+			<documentation>A property with the content model of gml:ShellPropertyType encapsulates a shell to represent a component of a solid boundary.</documentation>
+		</annotation>
+		<sequence>
+			<element ref="gml:Shell"/>
+		</sequence>
+	</complexType>
+</schema>
diff --git a/pycsw/schemas/ogc/gml/3.1.1/base/gml.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/gml.xsd
similarity index 50%
rename from pycsw/schemas/ogc/gml/3.1.1/base/gml.xsd
rename to pycsw/core/schemas/ogc/gml/3.2.1/gml.xsd
index 47e4c78..b319a19 100644
--- a/pycsw/schemas/ogc/gml/3.1.1/base/gml.xsd
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/gml.xsd
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:gml="http://www.opengis.net/gml"
-        xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1.1 2010-01-28">
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
 	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:gml:3.1.1">gml.xsd</appinfo>
-		<documentation>Top level GML schema
-			
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gml:3.2.1">gml.xsd</appinfo>
+		<documentation>
 			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+			Copyright (c) 2007,2010 Open Geospatial Consortium.
 			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
@@ -16,7 +14,7 @@
 	<include schemaLocation="coverage.xsd"/>
 	<include schemaLocation="coordinateReferenceSystems.xsd"/>
 	<include schemaLocation="observation.xsd"/>
-	<include schemaLocation="defaultStyle.xsd"/>
 	<include schemaLocation="temporalReferenceSystems.xsd"/>
+	<include schemaLocation="deprecatedTypes.xsd"/>
 	<!-- ====================================================================== -->
-</schema>
\ No newline at end of file
+</schema>
diff --git a/pycsw/plugins/profiles/apiso/schemas/ogc/iso/19139/20060504/gml/gmlBase.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/gmlBase.xsd
similarity index 64%
copy from pycsw/plugins/profiles/apiso/schemas/ogc/iso/19139/20060504/gml/gmlBase.xsd
copy to pycsw/core/schemas/ogc/gml/3.2.1/gmlBase.xsd
index ddb0b1c..036a291 100644
--- a/pycsw/plugins/profiles/apiso/schemas/ogc/iso/19139/20060504/gml/gmlBase.xsd
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/gmlBase.xsd
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.0">
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
 	<annotation>
-		<appinfo source="urn:ogc:specification:gml:schema-xsd:gmlBase:3.2.0">gmlBase.xsd</appinfo>
-		<appinfo source="urn:ogc:specification:gml:schema-xsd:gmlBase:3.2.0">
-			<sch:title>Schematron validation</sch:title>
-			<sch:ns prefix="gml" uri="http://www.opengis.net/gml"/>
-			<sch:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
-			<sch:pattern name="Check either href or content not both">
-				<sch:rule abstract="true" id="hrefOrContent">
-					<sch:report test="@xlink:href and (*|text())">Property element may not carry both a reference to an object and contain an object.</sch:report>
-					<sch:assert test="@xlink:href | (*|text())">Property element must either carry a reference to an object or contain an object.</sch:assert>
-				</sch:rule>
-			</sch:pattern>
-		</appinfo>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gmlBase:3.2.1">gmlBase.xsd</appinfo>
 		<documentation>See ISO/DIS 19136 7.2.
 The gmlBase schema components establish the GML model and syntax, in particular
 -	a root XML type from which XML types for all GML objects should be derived,
 -	a pattern and components for GML properties,
 -	patterns for collections and arrays, and components for generic collections and arrays,
 -	components for associating metadata with GML objects,
--	components for constructing definitions and dictionaries.</documentation>
+-	components for constructing definitions and dictionaries.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
 	</annotation>
+	<include schemaLocation="gml.xsd"/>
 	<include schemaLocation="basicTypes.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../../../../../../../../../pycsw/schemas/w3c/1999/xlink.xsd"/>
+	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../../w3c/1999/xlink.xsd"/>
 	<element name="AbstractObject" abstract="true">
 		<annotation>
 			<documentation>This element has no type defined, and is therefore implicitly (according to the rules of W3C XML Schema) an XML Schema anyType. It is used as the head of an XML Schema substitution group which unifies complex content and certain simple content elements used for datatypes in GML, including the gml:AbstractGML substitution group.</documentation>
@@ -30,7 +25,7 @@ The gmlBase schema components establish the GML model and syntax, in particular
 	</element>
 	<element name="AbstractGML" type="gml:AbstractGMLType" abstract="true" substitutionGroup="gml:AbstractObject">
 		<annotation>
-			<documentation>The abstract element gml:AbstractGML is “any GML object having identity”.   It acts as the head of an XML Schema substitution group, which may include any element which is a GML feature, or other object, with identity.  This is used as a variable in content models in GML core and application schemas.  It is effectively an abstract superclass for all GML objects.</documentation>
+			<documentation>The abstract element gml:AbstractGML is "any GML object having identity".   It acts as the head of an XML Schema substitution group, which may include any element which is a GML feature, or other object, with identity.  This is used as a variable in content models in GML core and application schemas.  It is effectively an abstract superclass for all GML objects.</documentation>
 		</annotation>
 	</element>
 	<complexType name="AbstractGMLType" abstract="true">
@@ -54,32 +49,31 @@ The gmlBase schema components establish the GML model and syntax, in particular
 		</annotation>
 		<attributeGroup ref="xlink:simpleAttrs"/>
 		<attribute name="nilReason" type="gml:NilReasonType"/>
-		<attribute ref="gml:remoteSchema"/>
+		<attribute ref="gml:remoteSchema">
+			<annotation>
+				<appinfo>deprecated</appinfo>
+			</annotation>
+		</attribute>
 	</attributeGroup>
-	<attribute name="remoteSchema" type="anyURI">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</attribute>
 	<element name="abstractAssociationRole" type="gml:AssociationRoleType" abstract="true">
 		<annotation>
 			<documentation>Applying this pattern shall restrict the multiplicity of objects in a property element using this content model to exactly one. An instance of this type shall contain an element representing an object, or serve as a pointer to a remote object.
 Applying the pattern to define an application schema specific property type allows to restrict
 -	the inline object to specified object types, 
--	the encoding to „by-reference only“ (see 7.2.3.7),
--	the encoding to „inline only“ (see 7.2.3.8).</documentation>
+-	the encoding to "by-reference only" (see 7.2.3.7),
+-	the encoding to "inline only" (see 7.2.3.8).</documentation>
 		</annotation>
 	</element>
 	<complexType name="AssociationRoleType">
 		<sequence minOccurs="0">
-			<element ref="gml:AbstractObject"/>
+			<any namespace="##any"/>
 		</sequence>
 		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
 		<attributeGroup ref="gml:AssociationAttributeGroup"/>
 	</complexType>
 	<attributeGroup name="OwnershipAttributeGroup">
 		<annotation>
-			<documentation>Encoding a GML property inline vs. by-reference shall not imply anything about the “ownership” of the contained or referenced GML Object, i.e. the encoding style shall not imply any “deep-copy” or “deep-delete” semantics. To express ownership over the contained or referenced GML Object, the gml:OwnershipAttributeGroup attribute group may be added to object-valued property elements. If the attribute group is not part of the content model of such a property element, then  [...]
+			<documentation>Encoding a GML property inline vs. by-reference shall not imply anything about the "ownership" of the contained or referenced GML Object, i.e. the encoding style shall not imply any "deep-copy" or "deep-delete" semantics. To express ownership over the contained or referenced GML Object, the gml:OwnershipAttributeGroup attribute group may be added to object-valued property elements. If the attribute group is not part of the content model of such a property element, then  [...]
 When the value of the owns attribute is "true", the existence of inline or referenced object(s) depends upon the existence of the parent object.</documentation>
 		</annotation>
 		<attribute name="owns" type="boolean" default="false"/>
@@ -89,13 +83,6 @@ When the value of the owns attribute is "true", the existence of inline or refer
 			<documentation>This element shows how an element 
 	declaration may include a Schematron constraint to limit the property to act 
 	in either inline or by-reference mode, but not both.</documentation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:abstractStrictAssociationRole">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
 		</annotation>
 	</element>
 	<element name="abstractReference" type="gml:ReferenceType" abstract="true">
@@ -105,7 +92,7 @@ When the value of the owns attribute is "true", the existence of inline or refer
 	</element>
 	<complexType name="ReferenceType">
 		<annotation>
-			<documentation>gml:ReferenceType is intended to be used in application schemas directly, if a property element shall use a “by-reference only” encoding.</documentation>
+			<documentation>gml:ReferenceType is intended to be used in application schemas directly, if a property element shall use a "by-reference only" encoding.</documentation>
 		</annotation>
 		<sequence/>
 		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
@@ -118,7 +105,7 @@ When the value of the owns attribute is "true", the existence of inline or refer
 	</element>
 	<complexType name="InlinePropertyType">
 		<sequence>
-			<element ref="gml:AbstractObject"/>
+			<any namespace="##any"/>
 		</sequence>
 		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
 	</complexType>
@@ -127,40 +114,6 @@ When the value of the owns attribute is "true", the existence of inline or refer
 			<documentation>If the value of an object property is another object and that object contains also a property for the association between the two objects, then this name of the reverse property may be encoded in a gml:reversePropertyName element in an appinfo annotation of the property element to document the constraint between the two properties. The value of the element shall contain the qualified name of the property element.</documentation>
 		</annotation>
 	</element>
-	<element name="member" type="gml:AssociationRoleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ArrayAssociationType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractObject" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="members" type="gml:ArrayAssociationType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<element name="metaDataProperty" type="gml:MetaDataPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
 	<element name="description" type="gml:StringOrRefType">
 		<annotation>
 			<documentation>The value of this property is a text description of the object. gml:description uses gml:StringOrRefType as its content model, so it may contain a simple text string content, or carry a reference to an external description. The use of gml:description to reference an external description has been deprecated and replaced by the gml:descriptionReference property.</documentation>
@@ -214,41 +167,6 @@ The allowed values for the aggregationType attribute are defined by gml:Aggregat
 			<enumeration value="table"/>
 		</restriction>
 	</simpleType>
-	<element name="Bag" type="gml:BagType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="BagType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:member" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Array" type="gml:ArrayType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ArrayType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
 	<complexType name="AbstractMetadataPropertyType" abstract="true">
 		<annotation>
 			<documentation>To associate metadata described by any XML Schema with a GML object, a property element shall be defined whose content model is derived by extension from gml:AbstractMetadataPropertyType. 
@@ -260,46 +178,8 @@ If metadata following the conceptual model of ISO 19115 is to be encoded in a GM
 		<sequence/>
 		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
 	</complexType>
-	<complexType name="MetaDataPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractMetaData"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attribute name="about" type="anyURI"/>
-	</complexType>
-	<element name="AbstractMetaData" type="gml:AbstractMetaDataType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="AbstractMetaDataType" abstract="true" mixed="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence/>
-		<attribute ref="gml:id"/>
-	</complexType>
-	<element name="GenericMetaData" type="gml:GenericMetaDataType" substitutionGroup="gml:AbstractMetaData">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="GenericMetaDataType" mixed="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent mixed="true">
-			<extension base="gml:AbstractMetaDataType">
-				<sequence>
-					<any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
 	<element name="targetElement" type="string"/>
 	<element name="associationName" type="string"/>
 	<element name="defaultCodeSpace" type="anyURI"/>
+	<element name="gmlProfileSchema" type="anyURI"/>
 </schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/gml_32_geometries.rdf b/pycsw/core/schemas/ogc/gml/3.2.1/gml_32_geometries.rdf
new file mode 100644
index 0000000..51bf90e
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/gml_32_geometries.rdf
@@ -0,0 +1,368 @@
+<?xml version="1.0"?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:skos="http://www.w3.org/2004/02/skos/core#"
+    xmlns:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+    xmlns:geo="http://www.opengis.net/ont/geosparql#"
+    xmlns:gml="http://www.opengis.net/ont/gml#"
+  xml:base="http://www.opengis.net/ont/gml">
+  <!--
+    GeoSPARQL 1.0 is an OGC Standard.
+    Copyright (c) 2012 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+    
+    Version: 1.0.1
+  -->
+  <owl:Ontology rdf:about="">
+    <owl:imports rdf:resource="http://www.opengis.net/ont/geosparql"/>
+  </owl:Ontology>
+  <owl:Class rdf:ID="Point">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="AbstractGeometricPrimitive"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Point</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="AbstractGriddedSurface">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="AbstractParametricCurveSurface"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Abstract Gridded Surface</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="PolyhedralSurface">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="Surface"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Polyhedral Surface</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Arc">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="ArcString"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Arc</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="PolynomialSpline">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="SplineCurve"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Polynomial Spline</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="MultiCurve">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="MultiGeometry"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Multi-Curve</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="CompositeSurface">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="Composite"/>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="OrientableSurface"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Composite Surface</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#ArcString">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Arc String</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Cylinder">
+    <rdfs:subClassOf rdf:resource="#AbstractGriddedSurface"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Cylinder</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Shell">
+    <rdfs:subClassOf rdf:resource="#CompositeSurface"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Shell</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Polygon">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#Surface"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Polygon</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Tin">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="TriangulatedSurface"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Triangulated Irregular Network</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#MultiGeometry">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="AbstractGeometry"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Multi-Geometry</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Bezier">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="BSpline"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Bezier</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Curve">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractGeometricPrimitive"/>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="OrientableCurve"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Curve</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#BSpline">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#SplineCurve"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">BSpline</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="LineStringSegment">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Line String Segment</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Geodesic">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="GeodesicString"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Geodesic</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="AbstractSurfacePatch">
+    <rdfs:subClassOf>
+      <rdf:Description rdf:about="http://www.opengis.net/ont/geosparql#Geometry">
+        <rdfs:isDefinedBy rdf:resource=""/>
+      </rdf:Description>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Abstract Surface Patch</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="GeometricComplex">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractGeometry"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Geometric Complex</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="ArcByBulge">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="ArcStringByBulge"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Arc by Bulge</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="CircleByCenterPoint">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="ArcByCenterPoint"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">CircleByCenterPoint</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="MultiPoint">
+    <rdfs:subClassOf rdf:resource="#MultiGeometry"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Multi-Point</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#ArcByCenterPoint">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Arc by Center Point</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="OffsetCurve">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Offset Curve</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#SplineCurve">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Spline Curve</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#Composite">
+    <rdfs:subClassOf rdf:resource="#GeometricComplex"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Composite</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="LineString">
+    <rdfs:subClassOf rdf:resource="#LineStringSegment"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Line String</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Circle">
+    <rdfs:subClassOf rdf:resource="#Arc"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Circle</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#OrientableCurve">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractGeometricPrimitive"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Orientable Curve</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#OrientableSurface">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractGeometricPrimitive"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Orientable Surface</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Clothoid">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Clothoid</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#ArcStringByBulge">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Arc String by Bulge</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#TriangulatedSurface">
+    <rdfs:subClassOf rdf:resource="#PolyhedralSurface"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Triangulated Surface</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Triangle">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="PolygonPatch"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Triangle</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="CubicSpline">
+    <rdfs:subClassOf rdf:resource="#PolynomialSpline"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Cubic Spline</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#AbstractGeometry">
+    <rdfs:subClassOf rdf:resource="http://www.opengis.net/ont/geosparql#Geometry"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Abstract Geometry</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Cone">
+    <rdfs:subClassOf rdf:resource="#AbstractGriddedSurface"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Cone</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="CompositeSolid">
+    <rdfs:subClassOf rdf:resource="#Composite"/>
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="Solid"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Composite Solid</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#AbstractGeometricPrimitive">
+    <rdfs:subClassOf rdf:resource="#AbstractGeometry"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Abstract Geometric Primitive</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="LinearRing">
+    <rdfs:subClassOf>
+      <owl:Class rdf:ID="Ring"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Linear Ring</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#AbstractParametricCurveSurface">
+    <rdfs:subClassOf rdf:resource="#AbstractSurfacePatch"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Abstract Parametric Curve Surface</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#GeodesicString">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#AbstractCurveSegment"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Geodesic String</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="MultiSolid">
+    <rdfs:subClassOf rdf:resource="#MultiGeometry"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Multi-Solid</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#Solid">
+    <rdfs:subClassOf rdf:resource="#AbstractGeometricPrimitive"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Solid</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="CompositeCurve">
+    <rdfs:subClassOf rdf:resource="#Composite"/>
+    <rdfs:subClassOf rdf:resource="#OrientableCurve"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Composite Curve</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Rectangle">
+    <rdfs:subClassOf>
+      <owl:Class rdf:about="#PolygonPatch"/>
+    </rdfs:subClassOf>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Rectangle</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="Sphere">
+    <rdfs:subClassOf rdf:resource="#AbstractGriddedSurface"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Sphere</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#Ring">
+    <rdfs:subClassOf rdf:resource="#CompositeCurve"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Ring</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#PolygonPatch">
+    <rdfs:subClassOf rdf:resource="#AbstractSurfacePatch"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Polygon Patch</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:ID="MultiSurface">
+    <rdfs:subClassOf rdf:resource="#MultiGeometry"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Multi-Surface</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#AbstractCurveSegment">
+    <rdfs:subClassOf rdf:resource="http://www.opengis.net/ont/geosparql#Geometry"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Abstract Curve Segment</rdfs:label>
+  </owl:Class>
+  <owl:Class rdf:about="#Surface">
+    <rdfs:subClassOf rdf:resource="#AbstractGeometricPrimitive"/>
+    <rdfs:subClassOf rdf:resource="#OrientableSurface"/>
+    <rdfs:isDefinedBy rdf:resource=""/>
+    <rdfs:label xml:lang="en">Surface</rdfs:label>
+  </owl:Class>
+  <rdf:Description rdf:about="http://www.opengis.net/ont/geosparql#Feature">
+    <rdfs:isDefinedBy rdf:resource=""/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://www.opengis.net/ont/geosparql#SpatialObject">
+    <rdfs:isDefinedBy rdf:resource=""/>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/gml_3_2_1-ReadMe.txt b/pycsw/core/schemas/ogc/gml/3.2.1/gml_3_2_1-ReadMe.txt
new file mode 100644
index 0000000..a0a6eb2
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/gml_3_2_1-ReadMe.txt
@@ -0,0 +1,58 @@
+OpenGIS(r) GML schema version 3.2.1 / ISO 19136 - ReadMe.txt
+
+The schema has been validated with Xerces-J, Xerces C++ and XSV.
+
+-------------------------------------------------------------------
+
+2012-07-21  Kevin Stegemoller
+
+  * v2.0.0 - v3.2.1 WARNING XLink change is NOT BACKWARD COMPATIBLE.
+  * changed OGC XLink (xlink:simpleLink) to W3C XLink (xlink:simpleAttrs)
+  per an approved TC and PC motion during the Dec. 2011 Brussels meeting.
+  see http://www.opengeospatial.org/blog/1597
+  * implement 11-025: retroactively require/add all leaf documents of an
+  XML namespace shall explicitly <include/> the all-components schema
+  * v3.2.1: updated xsd:schema:@version to 3.2.1.2 (06-135r7 s#13.4)
+
+2007-09-06  Kevin Stegemoller
+
+  GML 3.2.1 (ISO 19136)
+  * Published GML 3.2.1 schemas from OGC 07-036
+  * validated with oXygen 8.2 (xerces-J 2.9.0) - Kevin Stegemoller
+  * validated with Xerces-J, Xerces-C++ and XSV - Clemens Portele
+
+2007-08-17  Kevin Stegemoller
+
+  Changes made to these GML 3.2.1 / ISO 19136 schemas:
+  * added ReadMe.txt
+  * changed gmd.xsd references to "../../iso/19139/20070417/gmd/gmd.xsd"
+  * changed xlink references to be relative to /xlink/1.0.0/xlinks.xsd
+    available from schemas.opengis.net/xlink/1.0.0/xlinks.xsd (REMOVED 2012-07-21).
+  * removed xlinks schema and directory
+
+  Changes made to these ISO 19139 schemas by OGC:
+  * added ReadMe.txt
+  * changed ISO_19136 path to /gml/3.2.1/
+  * changed xlink references to be relative to /xlink/1.0.0/xlinks.xsd
+    available from schemas.opengis.net/xlink/1.0.0/xlinks.xsd (REMOVED 2012-07-21).
+  * removed xlinks schema and directory
+
+OGC GML 3.2.1 / ISO 19136 schemas files will be published at:
+- http://schemas.opengis.net/gml/3.2.1/
+- http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19136_Schemas/
+
+Files in the folder "ISO/19139/20070417" are also published at
+- http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/
+
+-------------------------------------------------------------------
+
+The Open Geospatial Consortium, Inc. official schema repository is at
+  http://schemas.opengis.net/ .
+Policies, Procedures, Terms, and Conditions of OGC(r) are available
+  http://www.opengeospatial.org/ogc/policies/ .
+Additional rights of use are described at
+  http://www.opengeospatial.org/legal/ . 
+
+Copyright (c) 2007 Open Geospatial Consortium.
+
+-------------------------------------------------------------------
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/grids.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/grids.xsd
new file mode 100644
index 0000000..7592e0e
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/grids.xsd
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:grids:3.2.1">grids.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 20.2.
+An implicit description of geometry is one in which the items of the geometry do not explicitly appear in the encoding.  Instead, a compact notation records a set of parameters, and a set of objects may be generated using a rule with these parameters.  This Clause provides grid geometries that are used in the description of gridded coverages and other applications.
+In GML two grid structures are defined, namely gml:Grid and gml:RectifiedGrid.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryBasic0d1d.xsd"/>
+	<element name="Grid" type="gml:GridType" substitutionGroup="gml:AbstractImplicitGeometry">
+		<annotation>
+			<documentation>The gml:Grid implicitly defines an unrectified grid, which is a network composed of two or more sets of curves in which the members of each set intersect the members of the other sets in an algorithmic way.  The region of interest within the grid is given in terms of its gml:limits, being the grid coordinates of  diagonally opposed corners of a rectangular region.  gml:axisLabels is provided with a list of labels of the axes of the grid (gml:axisName has been deprecated [...]
+The gml:limits element contains a single gml:GridEnvelope. The gml:low and gml:high property elements of the envelope are each integerLists, which are coordinate tuples, the coordinates being measured as offsets from the origin of the grid along each axis, of the diagonally opposing corners of a "rectangular" region of interest.</documentation>
+		</annotation>
+	</element>
+	<element name="AbstractImplicitGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:AbstractGeometry"/>
+	<complexType name="GridType">
+		<complexContent>
+			<extension base="gml:AbstractGeometryType">
+				<sequence>
+					<element name="limits" type="gml:GridLimitsType"/>
+					<choice>
+						<element name="axisLabels" type="gml:NCNameList"/>
+						<element name="axisName" type="string" maxOccurs="unbounded"/>
+					</choice>
+				</sequence>
+				<attribute name="dimension" type="positiveInteger" use="required"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="GridLimitsType">
+		<sequence>
+			<element name="GridEnvelope" type="gml:GridEnvelopeType"/>
+		</sequence>
+	</complexType>
+	<complexType name="GridEnvelopeType">
+		<sequence>
+			<element name="low" type="gml:integerList"/>
+			<element name="high" type="gml:integerList"/>
+		</sequence>
+	</complexType>
+	<element name="RectifiedGrid" type="gml:RectifiedGridType" substitutionGroup="gml:Grid">
+		<annotation>
+			<documentation>A rectified grid is a grid for which there is an affine transformation between the grid coordinates and the coordinates of an external coordinate reference system. It is defined by specifying the position (in some geometric space) of the grid "origin" and of the vectors that specify the post locations.
+Note that the grid limits (post indexes) and axis name properties are inherited from gml:GridType and that gml:RectifiedGrid adds a gml:origin property (contains or references a gml:Point) and a set of gml:offsetVector properties.</documentation>
+		</annotation>
+	</element>
+	<complexType name="RectifiedGridType">
+		<complexContent>
+			<extension base="gml:GridType">
+				<sequence>
+					<element name="origin" type="gml:PointPropertyType"/>
+					<element name="offsetVector" type="gml:VectorType" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/measures.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/measures.xsd
new file mode 100644
index 0000000..c3a91fb
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/measures.xsd
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" xml:lang="en" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:measures:3.2.1">measures.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 17.3.
+gml:MeasureType is defined in the basicTypes schema.  The measure types defined here correspond with a set of convenience measure types described in ISO/TS 19103.  The XML implementation is based on the XML Schema simple type "double" which supports both decimal and scientific notation, and includes an XML attribute "uom" which refers to the units of measure for the value.  Note that, there is no requirement to store values using any particular format, and applications receiving elements [...]
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="units.xsd"/>
+	<element name="measure" type="gml:MeasureType">
+		<annotation>
+			<documentation>The value of a physical quantity, together with its unit.</documentation>
+		</annotation>
+	</element>
+	<complexType name="LengthType">
+		<annotation>
+			<documentation>This is a prototypical definition for a specific measure type defined as a vacuous extension (i.e. aliases) of gml:MeasureType. In this case, the content model supports the description of a length (or distance) quantity, with its units. The unit of measure referenced by uom shall be suitable for a length, such as metres or feet.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<complexType name="ScaleType">
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<complexType name="TimeType">
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<complexType name="GridLengthType">
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<complexType name="AreaType">
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<complexType name="VolumeType">
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<complexType name="SpeedType">
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<complexType name="AngleType">
+		<simpleContent>
+			<extension base="gml:MeasureType"/>
+		</simpleContent>
+	</complexType>
+	<element name="angle" type="gml:AngleType">
+		<annotation>
+			<documentation>The gml:angle property element is used to record the value of an angle quantity as a single number, with its units.</documentation>
+		</annotation>
+	</element>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/observation.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/observation.xsd
new file mode 100644
index 0000000..944c989
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/observation.xsd
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:observation:3.2.1">observation.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 19.
+A GML observation models the act of observing, often with a camera, a person or some form of instrument.  An observation feature describes the "metadata" associated with an information capture event, together with a value for the result of the observation.  This covers a broad range of cases, from a tourist photo (not the photo but the act of taking the photo), to images acquired by space borne sensors or the measurement of a temperature 5 meters below the surfaces of a lake.
+The basic structures introduced in this schema are intended to serve as the foundation for more comprehensive schemas for scientific, technical and engineering measurement schemas.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="feature.xsd"/>
+	<include schemaLocation="direction.xsd"/>
+	<include schemaLocation="valueObjects.xsd"/>
+	<element name="Observation" type="gml:ObservationType" substitutionGroup="gml:AbstractFeature">
+		<annotation>
+			<documentation>The content model is a straightforward extension of gml:AbstractFeatureType; it automatically has the gml:identifier, gml:description, gml:descriptionReference, gml:name, and gml:boundedBy properties. 
+The gml:validTime element describes the time of the observation. Note that this may be a time instant or a time period.
+The gml:using property contains or references a description of a sensor, instrument or procedure used for the observation.
+The gml:target property contains or references the specimen, region or station which is the object of the observation. This property is particularly useful for remote observations, such as photographs, where a generic location property might apply to the location of the camera or the location of the field of view, and thus may be ambiguous.  
+The gml:subject element is provided as a convenient synonym for gml:target. This is the term commonly used in phtotography.  
+The gml:resultOf property indicates the result of the observation.  The value may be inline, or a reference to a value elsewhere.
+</documentation>
+		</annotation>
+	</element>
+	<complexType name="ObservationType">
+		<complexContent>
+			<extension base="gml:AbstractFeatureType">
+				<sequence>
+					<element ref="gml:validTime"/>
+					<element ref="gml:using" minOccurs="0"/>
+					<element ref="gml:target" minOccurs="0"/>
+					<element ref="gml:resultOf"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="using" type="gml:ProcedurePropertyType"/>
+	<complexType name="ProcedurePropertyType">
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractFeature"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="target" type="gml:TargetPropertyType"/>
+	<element name="subject" type="gml:TargetPropertyType" substitutionGroup="gml:target"/>
+	<complexType name="TargetPropertyType">
+		<choice minOccurs="0">
+			<element ref="gml:AbstractFeature"/>
+			<element ref="gml:AbstractGeometry"/>
+		</choice>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="resultOf" type="gml:ResultType"/>
+	<complexType name="ResultType">
+		<sequence minOccurs="0">
+			<any namespace="##any"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="DirectedObservation" type="gml:DirectedObservationType" substitutionGroup="gml:Observation">
+		<annotation>
+			<documentation>A gml:DirectedObservation is the same as an observation except that it adds an additional gml:direction property. This is the direction in which the observation was acquired. Clearly this applies only to certain types of observations such as visual observations by people, or observations obtained from terrestrial cameras.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DirectedObservationType">
+		<complexContent>
+			<extension base="gml:ObservationType">
+				<sequence>
+					<element ref="gml:direction"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="DirectedObservationAtDistance" type="gml:DirectedObservationAtDistanceType" substitutionGroup="gml:DirectedObservation">
+		<annotation>
+			<documentation>gml:DirectedObservationAtDistance adds an additional distance property. This is the distance from the observer to the subject of the observation. Clearly this applies only to certain types of observations such as visual observations by people, or observations obtained from terrestrial cameras.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DirectedObservationAtDistanceType">
+		<complexContent>
+			<extension base="gml:DirectedObservationType">
+				<sequence>
+					<element name="distance" type="gml:MeasureType"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/referenceSystems.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/referenceSystems.xsd
new file mode 100644
index 0000000..a193b18
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/referenceSystems.xsd
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:referenceSystems:3.2.1">referenceSystems.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 13.2.
+The reference systems schema components have two logical parts, which define elements and types for XML encoding of the definitions of:
+-	Identified Object, inherited by the ten types of GML objects used for coordinate reference systems and coordinate operations
+-	High-level part of the definitions of coordinate reference systems
+This schema encodes the Identified Object and Reference System packages of the UML Model for ISO 19111.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="dictionary.xsd"/>
+	<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="../../../../../plugins/profiles/apiso/schemas/ogc/iso/19139/20070417/gmd/gmd.xsd"/>
+	<complexType name="IdentifiedObjectType" abstract="true">
+		<annotation>
+			<documentation>gml:IdentifiedObjectType provides identification properties of a CRS-related object. In gml:DefinitionType, the gml:identifier element shall be the primary name by which this object is identified, encoding the "name" attribute in the UML model.
+Zero or more of the gml:name elements can be an unordered set of "identifiers", encoding the "identifier" attribute in the UML model. Each of these gml:name elements can reference elsewhere the object's defining information or be an identifier by which this object can be referenced.
+Zero or more other gml:name elements can be an unordered set of "alias" alternative names by which this CRS related object is identified, encoding the "alias" attributes in the UML model. An object may have several aliases, typically used in different contexts. The context for an alias is indicated by the value of its (optional) codeSpace attribute.
+Any needed version information shall be included in the codeSpace attribute of a gml:identifier and gml:name elements. In this use, the gml:remarks element in the gml:DefinitionType shall contain comments on or information about this object, including data source information.</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:DefinitionType"/>
+		</complexContent>
+	</complexType>
+	<element name="AbstractCRS" type="gml:AbstractCRSType" abstract="true" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>gml:AbstractCRS specifies a coordinate reference system which is usually single but may be compound. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractCRSType" abstract="true">
+		<complexContent>
+			<extension base="gml:IdentifiedObjectType">
+				<sequence>
+					<element ref="gml:domainOfValidity" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:scope" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="domainOfValidity">
+		<annotation>
+			<documentation>The gml:domainOfValidity property implements an association role to an EX_Extent object as encoded in ISO/TS 19139, either referencing or containing the definition of that extent.</documentation>
+		</annotation>
+		<complexType>
+			<sequence minOccurs="0">
+				<element ref="gmd:EX_Extent"/>
+			</sequence>
+			<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		</complexType>
+	</element>
+	<element name="scope" type="string">
+		<annotation>
+			<documentation>The gml:scope property provides a description of the usage, or limitations of usage, for which this CRS-related object is valid. If unknown, enter "not known".</documentation>
+		</annotation>
+	</element>
+	<complexType name="CRSPropertyType">
+		<annotation>
+			<documentation>gml:CRSPropertyType is a property type for association roles to a CRS abstract coordinate reference system, either referencing or containing the definition of that CRS.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractCRS"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/temporal.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/temporal.xsd
new file mode 100644
index 0000000..11c4ae3
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/temporal.xsd
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporal:3.2.1">temporal.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 15.2.
+The GML temporal schemas include components for describing temporal geometry and topology, temporal reference systems, and the temporal characteristics of geographic data. The model underlying the representation constitutes a profile of the conceptual schema described in ISO 19108. The underlying spatiotemporal model strives to accommodate both feature-level and attribute-level time stamping; basic support for tracking moving objects is also included. 
+Time is measured on two types of scales: interval and ordinal.  An interval scale offers a basis for measuring duration, an ordinal scale provides information only about relative position in time.
+Two other ISO standards are relevant to describing temporal objects:  ISO 8601 describes encodings for time instants and time periods, as text strings with particular structure and punctuation; ISO 11404 provides a detailed description of time intervals as part of a general discussion of language independent datatypes.  
+The temporal schemas cover two interrelated topics and provide basic schema components for representing temporal instants and periods, temporal topology, and reference systems; more specialized schema components defines components used for dynamic features. Instances of temporal geometric types are used as values for the temporal properties of geographic features.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="gmlBase.xsd"/>
+	<element name="AbstractTimeObject" type="gml:AbstractTimeObjectType" abstract="true" substitutionGroup="gml:AbstractGML">
+		<annotation>
+			<documentation>gml:AbstractTimeObject acts as the head of a substitution group for all temporal primitives and complexes.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractTimeObjectType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractGMLType"/>
+		</complexContent>
+	</complexType>
+	<element name="AbstractTimePrimitive" type="gml:AbstractTimePrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimeObject">
+		<annotation>
+			<documentation>gml:AbstractTimePrimitive acts as the head of a substitution group for geometric and topological temporal primitives.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractTimePrimitiveType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractTimeObjectType">
+				<sequence>
+					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimePrimitivePropertyType">
+		<annotation>
+			<documentation>gml:TimePrimitivePropertyType provides a standard content model for associations between an arbitrary member of the substitution group whose head is gml:AbstractTimePrimitive and another object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractTimePrimitive"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="validTime" type="gml:TimePrimitivePropertyType">
+		<annotation>
+			<documentation>gml:validTime is a convenience property element.</documentation>
+		</annotation>
+	</element>
+	<complexType name="RelatedTimeType">
+		<annotation>
+			<documentation>gml:RelatedTimeType provides a content model for indicating the relative position of an arbitrary member of the substitution group whose head is gml:AbstractTimePrimitive. It extends the generic gml:TimePrimitivePropertyType with an XML attribute relativePosition, whose value is selected from the set of 13 temporal relationships identified by Allen (1983)</documentation>
+		</annotation>
+		<complexContent>
+			<extension base="gml:TimePrimitivePropertyType">
+				<attribute name="relativePosition">
+					<simpleType>
+						<restriction base="string">
+							<enumeration value="Before"/>
+							<enumeration value="After"/>
+							<enumeration value="Begins"/>
+							<enumeration value="Ends"/>
+							<enumeration value="During"/>
+							<enumeration value="Equals"/>
+							<enumeration value="Contains"/>
+							<enumeration value="Overlaps"/>
+							<enumeration value="Meets"/>
+							<enumeration value="OverlappedBy"/>
+							<enumeration value="MetBy"/>
+							<enumeration value="BegunBy"/>
+							<enumeration value="EndedBy"/>
+						</restriction>
+					</simpleType>
+				</attribute>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AbstractTimeComplex" type="gml:AbstractTimeComplexType" abstract="true" substitutionGroup="gml:AbstractTimeObject">
+		<annotation>
+			<documentation>gml:AbstractTimeComplex is an aggregation of temporal primitives and acts as the head of a substitution group for temporal complexes.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractTimeComplexType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractTimeObjectType"/>
+		</complexContent>
+	</complexType>
+	<element name="AbstractTimeGeometricPrimitive" type="gml:AbstractTimeGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimePrimitive">
+		<annotation>
+			<documentation>gml:TimeGeometricPrimitive acts as the head of a substitution group for geometric temporal primitives.
+A temporal geometry shall be associated with a temporal reference system through the frame attribute that provides a URI reference that identifies a description of the reference system. Following ISO 19108, the Gregorian calendar with UTC is the default reference system, but others may also be used. The GPS calendar is an alternative reference systems in common use.
+The two geometric primitives in the temporal dimension are the instant and the period. GML components are defined to support these as follows.</documentation>
+		</annotation>
+	</element>
+	<complexType name="AbstractTimeGeometricPrimitiveType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractTimePrimitiveType">
+				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="TimeInstant" type="gml:TimeInstantType" substitutionGroup="gml:AbstractTimeGeometricPrimitive">
+		<annotation>
+			<documentation>gml:TimeInstant acts as a zero-dimensional geometric primitive that represents an identifiable position in time.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeInstantType" final="#all">
+		<complexContent>
+			<extension base="gml:AbstractTimeGeometricPrimitiveType">
+				<sequence>
+					<element ref="gml:timePosition"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeInstantPropertyType">
+		<annotation>
+			<documentation>gml:TimeInstantPropertyType provides for associating a gml:TimeInstant with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeInstant"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="TimePeriod" type="gml:TimePeriodType" substitutionGroup="gml:AbstractTimeGeometricPrimitive">
+		<annotation>
+			<documentation>gml:TimePeriod acts as a one-dimensional geometric primitive that represents an identifiable extent in time.
+The location in of a gml:TimePeriod is described by the temporal positions of the instants at which it begins and ends. The length of the period is equal to the temporal distance between the two bounding temporal positions. 
+Both beginning and end may be described in terms of their direct position using gml:TimePositionType which is an XML Schema simple content type, or by reference to an indentifiable time instant using gml:TimeInstantPropertyType.
+Alternatively a limit of a gml:TimePeriod may use the conventional GML property model to make a reference to a time instant described elsewhere, or a limit may be indicated as a direct position.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimePeriodType">
+		<complexContent>
+			<extension base="gml:AbstractTimeGeometricPrimitiveType">
+				<sequence>
+					<choice>
+						<element name="beginPosition" type="gml:TimePositionType"/>
+						<element name="begin" type="gml:TimeInstantPropertyType"/>
+					</choice>
+					<choice>
+						<element name="endPosition" type="gml:TimePositionType"/>
+						<element name="end" type="gml:TimeInstantPropertyType"/>
+					</choice>
+					<group ref="gml:timeLength" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimePeriodPropertyType">
+		<annotation>
+			<documentation>gml:TimePeriodPropertyType provides for associating a gml:TimePeriod with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimePeriod"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<complexType name="TimePositionType" final="#all">
+		<annotation>
+			<documentation>The method for identifying a temporal position is specific to each temporal reference system.  gml:TimePositionType supports the description of temporal position according to the subtypes described in ISO 19108.
+Values based on calendars and clocks use lexical formats that are based on ISO 8601, as described in XML Schema Part 2:2001. A decimal value may be used with coordinate systems such as GPS time or UNIX time. A URI may be used to provide a reference to some era in an ordinal reference system . 
+In common with many of the components modelled as data types in the ISO 19100 series of International Standards, the corresponding GML component has simple content. However, the content model gml:TimePositionType is defined in several steps.
+Three XML attributes appear on gml:TimePositionType:
+A time value shall be associated with a temporal reference system through the frame attribute that provides a URI reference that identifies a description of the reference system. Following ISO 19108, the Gregorian calendar with UTC is the default reference system, but others may also be used. Components for describing temporal reference systems are described in 14.4, but it is not required that the reference system be described in this, as the reference may refer to anything that may be  [...]
+For time values using a calendar containing more than one era, the (optional) calendarEraName attribute provides the name of the calendar era.  
+Inexact temporal positions may be expressed using the optional indeterminatePosition attribute.  This takes a value from an enumeration.</documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="gml:TimePositionUnion">
+				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
+				<attribute name="calendarEraName" type="string"/>
+				<attribute name="indeterminatePosition" type="gml:TimeIndeterminateValueType"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<simpleType name="TimeIndeterminateValueType">
+		<annotation>
+			<documentation>These values are interpreted as follows: 
+-	"unknown" indicates that no specific value for temporal position is provided.
+-	"now" indicates that the specified value shall be replaced with the current temporal position whenever the value is accessed.
+-	"before" indicates that the actual temporal position is unknown, but it is known to be before the specified value.
+-	"after" indicates that the actual temporal position is unknown, but it is known to be after the specified value.
+A value for indeterminatePosition may 
+-	be used either alone, or 
+-	qualify a specific value for temporal position.</documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="after"/>
+			<enumeration value="before"/>
+			<enumeration value="now"/>
+			<enumeration value="unknown"/>
+		</restriction>
+	</simpleType>
+	<simpleType name="TimePositionUnion">
+		<annotation>
+			<documentation>The simple type gml:TimePositionUnion is a union of XML Schema simple types which instantiate the subtypes for temporal position described in ISO 19108.
+ An ordinal era may be referenced via URI.  A decimal value may be used to indicate the distance from the scale origin .  time is used for a position that recurs daily (see ISO 19108:2002 5.4.4.2).
+ Finally, calendar and clock forms that support the representation of time in systems based on years, months, days, hours, minutes and seconds, in a notation following ISO 8601, are assembled by gml:CalDate</documentation>
+		</annotation>
+		<union memberTypes="gml:CalDate time dateTime anyURI decimal"/>
+	</simpleType>
+	<simpleType name="CalDate">
+		<union memberTypes="date gYearMonth gYear"/>
+	</simpleType>
+	<element name="timePosition" type="gml:TimePositionType">
+		<annotation>
+			<documentation>This element is used directly as a property of gml:TimeInstant (see 15.2.2.3), and may also be used in application schemas.</documentation>
+		</annotation>
+	</element>
+	<group name="timeLength">
+		<annotation>
+			<documentation>The length of a time period.</documentation>
+		</annotation>
+		<choice>
+			<element ref="gml:duration"/>
+			<element ref="gml:timeInterval"/>
+		</choice>
+	</group>
+	<element name="duration" type="duration">
+		<annotation>
+			<documentation>gml:duration conforms to the ISO 8601 syntax for temporal length as implemented by the XML Schema duration type.</documentation>
+		</annotation>
+	</element>
+	<element name="timeInterval" type="gml:TimeIntervalLengthType">
+		<annotation>
+			<documentation> gml:timeInterval conforms to ISO 11404 which is based on floating point values for temporal length.
+ISO 11404 syntax specifies the use of a positiveInteger together with appropriate values for radix and factor. The resolution of the time interval is to one radix ^(-factor) of the specified time unit.
+The value of the unit is either selected from the units for time intervals from ISO 31-1:1992, or is another suitable unit.  The encoding is defined for GML in gml:TimeUnitType. The second component of this union type provides a method for indicating time units other than the six standard units given in the enumeration.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeIntervalLengthType" final="#all">
+		<simpleContent>
+			<extension base="decimal">
+				<attribute name="unit" type="gml:TimeUnitType" use="required"/>
+				<attribute name="radix" type="positiveInteger"/>
+				<attribute name="factor" type="integer"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<simpleType name="TimeUnitType">
+		<union>
+			<simpleType>
+				<restriction base="string">
+					<enumeration value="year"/>
+					<enumeration value="month"/>
+					<enumeration value="day"/>
+					<enumeration value="hour"/>
+					<enumeration value="minute"/>
+					<enumeration value="second"/>
+				</restriction>
+			</simpleType>
+			<simpleType>
+				<restriction base="string">
+					<pattern value="other:\w{2,}"/>
+				</restriction>
+			</simpleType>
+		</union>
+	</simpleType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/temporalReferenceSystems.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/temporalReferenceSystems.xsd
new file mode 100644
index 0000000..88f610b
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/temporalReferenceSystems.xsd
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporalReferenceSystems:3.2.1">temporalReferenceSystems.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 15.5.
+A value in the time domain is measured relative to a temporal reference system. Common types of reference systems include calendars, ordinal temporal reference systems, and temporal coordinate systems (time elapsed since some epoch).  The primary temporal reference system for use with geographic information is the Gregorian Calendar and 24 hour local or Coordinated Universal Time (UTC), but special applications may entail the use of alternative reference systems.  The Julian day numberin [...]
+In GML seven concrete elements are used to describe temporal reference systems: gml:TimeReferenceSystem, gml:TimeCoordinateSystem, gml:TimeCalendar, gml:TimeCalendarEra, gml:TimeClock, gml:TimeOrdinalReferenceSystem, and gml:TimeOrdinalEra.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="temporalTopology.xsd"/>
+	<include schemaLocation="dictionary.xsd"/>
+	<element name="TimeReferenceSystem" type="gml:TimeReferenceSystemType" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>A reference system is characterized in terms of its domain of validity: the spatial and temporal extent over which it is applicable. The basic GML element for temporal reference systems is gml:TimeReferenceSystem.  Its content model extends gml:DefinitionType with one additional property, gml:domainOfValidity.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeReferenceSystemType">
+		<complexContent>
+			<extension base="gml:DefinitionType">
+				<sequence>
+					<element name="domainOfValidity" type="string"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="TimeCoordinateSystem" type="gml:TimeCoordinateSystemType" substitutionGroup="gml:TimeReferenceSystem">
+		<annotation>
+			<documentation>A temporal coordinate system shall be based on a continuous interval scale defined in terms of a single time interval.
+The differences to ISO 19108 TM_CoordinateSystem are:
+-	the origin is specified either using the property gml:originPosition whose value is a direct time position, or using the property gml:origin whose model is gml:TimeInstantPropertyType; this permits more flexibility in representation and also supports referring to a value fixed elsewhere;
+-	the interval uses gml:TimeIntervalLengthType.
+</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeCoordinateSystemType">
+		<complexContent>
+			<extension base="gml:TimeReferenceSystemType">
+				<sequence>
+					<choice>
+						<element name="originPosition" type="gml:TimePositionType"/>
+						<element name="origin" type="gml:TimeInstantPropertyType"/>
+					</choice>
+					<element name="interval" type="gml:TimeIntervalLengthType"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="TimeCalendar" type="gml:TimeCalendarType" substitutionGroup="gml:TimeReferenceSystem">
+		<annotation>
+			<documentation>A calendar is a discrete temporal reference system that provides a basis for defining temporal position to a resolution of one day.
+gml:TimeCalendar adds one property to those inherited from gml:TimeReferenceSystem. A gml:referenceFrame provides a link to a gml:TimeCalendarEra that it uses. A  gml:TimeCalendar may reference more than one calendar era. 
+The referenceFrame element follows the standard GML property model, allowing the association to be instantiated either using an inline description using the gml:TimeCalendarEra element, or a link to a gml:TimeCalendarEra which is explicit elsewhere.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeCalendarType">
+		<complexContent>
+			<extension base="gml:TimeReferenceSystemType">
+				<sequence>
+					<element name="referenceFrame" type="gml:TimeCalendarEraPropertyType" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="TimeCalendarEra" type="gml:TimeCalendarEraType">
+		<annotation>
+			<documentation>gml:TimeCalendarEra inherits basic properties from gml:DefinitionType and has the following additional properties:
+-	gml:referenceEvent is the name or description of a mythical or historic event which fixes the position of the base scale of the calendar era.  This is given as text or using a link to description held elsewhere.
+-	gml:referenceDate specifies the date of the referenceEvent expressed as a date in the given calendar.  In most calendars, this date is the origin (i.e., the first day) of the scale, but this is not always true.
+-	gml:julianReference specifies the Julian date that corresponds to the reference date.  The Julian day number is an integer value; the Julian date is a decimal value that allows greater resolution.  Transforming calendar dates to and from Julian dates provides a relatively simple basis for transforming dates from one calendar to another.
+-	gml:epochOfUse is the period for which the calendar era was used as a basis for dating.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeCalendarEraType">
+		<complexContent>
+			<extension base="gml:DefinitionType">
+				<sequence>
+					<element name="referenceEvent" type="gml:StringOrRefType"/>
+					<element name="referenceDate" type="gml:CalDate"/>
+					<element name="julianReference" type="decimal"/>
+					<element name="epochOfUse" type="gml:TimePeriodPropertyType"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeCalendarPropertyType">
+		<annotation>
+			<documentation>gml:TimeCalendarPropertyType provides for associating a gml:TimeCalendar with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeCalendar"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<complexType name="TimeCalendarEraPropertyType">
+		<annotation>
+			<documentation>gml:TimeCalendarEraPropertyType provides for associating a gml:TimeCalendarEra with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeCalendarEra"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="TimeClock" type="gml:TimeClockType" substitutionGroup="gml:TimeReferenceSystem">
+		<annotation>
+			<documentation>A clock provides a basis for defining temporal position within a day. A clock shall be used with a calendar in order to provide a complete description of a temporal position within a specific day.
+gml:TimeClock adds the following properties to those inherited from gml:TimeReferenceSystemType:
+-	gml:referenceEvent is the name or description of an event, such as solar noon or sunrise, which fixes the position of the base scale of the clock.
+-	gml:referenceTime specifies the time of day associated with the reference event expressed as a time of day in the given clock. The reference time is usually the origin of the clock scale. 
+-	gml:utcReference specifies the 24 hour local or UTC time that corresponds to the reference time.
+-	gml:dateBasis contains or references the calendars that use this clock.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeClockType" final="#all">
+		<complexContent>
+			<extension base="gml:TimeReferenceSystemType">
+				<sequence>
+					<element name="referenceEvent" type="gml:StringOrRefType"/>
+					<element name="referenceTime" type="time"/>
+					<element name="utcReference" type="time"/>
+					<element name="dateBasis" type="gml:TimeCalendarPropertyType" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeClockPropertyType">
+		<annotation>
+			<documentation>gml:TimeClockPropertyType provides for associating a gml:TimeClock with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeClock"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<element name="TimeOrdinalReferenceSystem" type="gml:TimeOrdinalReferenceSystemType" substitutionGroup="gml:TimeReferenceSystem">
+		<annotation>
+			<documentation>In some applications of geographic information — such as geology and archaeology — relative position in time is known more precisely than absolute time or duration. The order of events in time can be well established, but the magnitude of the intervals between them cannot be accurately determined; in such cases, the use of an ordinal temporal reference system is appropriate. An ordinal temporal reference system is composed of a sequence of named coterminous eras, which  [...]
+An ordinal temporal reference system whose component eras are not further subdivided is effectively a temporal topological complex constrained to be a linear graph. An ordinal temporal reference system some or all of whose component eras are subdivided is effectively a temporal topological complex with the constraint that parallel branches may only be constructed in pairs where one is a single temporal ordinal era and the other is a sequence of temporal ordinal eras that are called "memb [...]
+The positions of the beginning and end of a given era may calibrate the relative time scale.
+gml:TimeOrdinalReferenceSystem adds one or more gml:component properties to the generic temporal reference system model.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeOrdinalReferenceSystemType">
+		<complexContent>
+			<extension base="gml:TimeReferenceSystemType">
+				<sequence>
+					<element name="component" type="gml:TimeOrdinalEraPropertyType" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="TimeOrdinalEra" type="gml:TimeOrdinalEraType">
+		<annotation>
+			<documentation>Its content model follows the pattern of gml:TimeEdge, inheriting standard properties from gml:DefinitionType, and adding gml:start, gml:end and gml:extent properties, a set of gml:member properties which indicate ordered gml:TimeOrdinalEra elements, and a gml:group property which points to the parent era.
+The recursive inclusion of gml:TimeOrdinalEra elements allow the construction of an arbitrary depth hierarchical ordinal reference schema, such that an ordinal era at a given level of the hierarchy includes a sequence of shorter, coterminous ordinal eras.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeOrdinalEraType">
+		<complexContent>
+			<extension base="gml:DefinitionType">
+				<sequence>
+					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
+					<element name="start" type="gml:TimeNodePropertyType" minOccurs="0"/>
+					<element name="end" type="gml:TimeNodePropertyType" minOccurs="0"/>
+					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
+					<element name="member" type="gml:TimeOrdinalEraPropertyType" minOccurs="0" maxOccurs="unbounded"/>
+					<element name="group" type="gml:ReferenceType" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeOrdinalEraPropertyType">
+		<annotation>
+			<documentation>gml:TimeOrdinalEraPropertyType provides for associating a gml:TimeOrdinalEra with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeOrdinalEra"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/temporalTopology.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/temporalTopology.xsd
new file mode 100644
index 0000000..b38392c
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/temporalTopology.xsd
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporalTopology:3.2.1">temporalTopology.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 15.3.
+Temporal topology is described in terms of time complexes, nodes, and edges, and the connectivity between these. Temporal topology does not directly provide information about temporal position. It is used in the case of describing a lineage or a history (e.g. a family tree expressing evolution of species, an ecological cycle, a lineage of lands or buildings, or a history of separation and merger of administrative boundaries). The following Subclauses specifies the temporal topology as te [...]
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="temporal.xsd"/>
+	<element name="AbstractTimeTopologyPrimitive" type="gml:AbstractTimeTopologyPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimePrimitive">
+		<annotation>
+			<documentation>gml:TimeTopologyPrimitive acts as the head of a substitution group for topological temporal primitives.
+Temporal topology primitives shall imply the ordering information between features or feature properties. The temporal connection of features can be examined if they have temporal topology primitives as values of their properties. Usually, an instantaneous feature associates with a time node, and a static feature associates with a time edge.  A feature with both modes associates with the temporal topology primitive: a supertype of time nodes and time edges.
+A topological primitive is always connected to one or more other topological primitives, and is, therefore, always a member of a topological complex. In a GML instance, this will often be indicated by the primitives being described by elements that are descendents of an element describing a complex. However, in order to support the case where a temporal topological primitive is described in another context, the optional complex property is provided, which carries a reference to the paren [...]
+		</annotation>
+	</element>
+	<complexType name="AbstractTimeTopologyPrimitiveType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractTimePrimitiveType">
+				<sequence>
+					<element name="complex" type="gml:ReferenceType" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeTopologyPrimitivePropertyType">
+		<annotation>
+			<documentation>gml:TimeTopologyPrimitivePropertyType provides for associating a gml:AbstractTimeTopologyPrimitive with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:AbstractTimeTopologyPrimitive"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="TimeTopologyComplex" type="gml:TimeTopologyComplexType" substitutionGroup="gml:AbstractTimeComplex">
+		<annotation>
+			<documentation>A temporal topology complex shall be the connected acyclic directed graph composed of temporal topological primitives, i.e. time nodes and time edges. Because a time edge may not exist without two time nodes on its boundaries, static features have time edges from a temporal topology complex as the values of their temporal properties, regardless of explicit declarations.
+A temporal topology complex expresses a linear or a non-linear graph. A temporal linear graph, composed of a sequence of time edges, provides a lineage described only by "substitution" of feature instances or feature element values. A time node as the start or the end of the graph connects with at least one time edge. A time node other than the start and the end shall connect to at least two time edges: one of starting from the node, and another ending at the node.
+A temporal topological complex is a set of connected temporal topological primitives. The member primtives are indicated, either by reference or by value, using the primitive property.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeTopologyComplexType" abstract="true">
+		<complexContent>
+			<extension base="gml:AbstractTimeComplexType">
+				<sequence>
+					<element name="primitive" type="gml:TimeTopologyPrimitivePropertyType" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeTopologyComplexPropertyType">
+		<annotation>
+			<documentation>gml:TimeTopologyComplexPropertyType provides for associating a gml:TimeTopologyComplex with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeTopologyComplex"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="TimeNode" type="gml:TimeNodeType" substitutionGroup="gml:AbstractTimeTopologyPrimitive">
+		<annotation>
+			<documentation>A time node is a zero-dimensional topological primitive that represents an identifiable node in time (it is equivalent to a point in space). A node may act as the termination or initiation of any number of time edges. A time node may be realised as a geometry, its position, whose value is a time instant.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeNodeType">
+		<complexContent>
+			<extension base="gml:AbstractTimeTopologyPrimitiveType">
+				<sequence>
+					<element name="previousEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
+					<element name="nextEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
+					<element name="position" type="gml:TimeInstantPropertyType" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeNodePropertyType">
+		<annotation>
+			<documentation>gml:TimeNodePropertyType provides for associating a gml:TimeNode with an object</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeNode"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="TimeEdge" type="gml:TimeEdgeType" substitutionGroup="gml:AbstractTimeTopologyPrimitive">
+		<annotation>
+			<documentation>A time edge is a one-dimensional topological primitive. It is an open interval that starts and ends at a node. The edge may be realised as a geometry whose value is a time period.</documentation>
+		</annotation>
+	</element>
+	<complexType name="TimeEdgeType">
+		<complexContent>
+			<extension base="gml:AbstractTimeTopologyPrimitiveType">
+				<sequence>
+					<element name="start" type="gml:TimeNodePropertyType"/>
+					<element name="end" type="gml:TimeNodePropertyType"/>
+					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="TimeEdgePropertyType">
+		<annotation>
+			<documentation>gml:TimeEdgePropertyType provides for associating a gml:TimeEdge with an object.</documentation>
+		</annotation>
+		<sequence minOccurs="0">
+			<element ref="gml:TimeEdge"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/topology.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/topology.xsd
new file mode 100644
index 0000000..c528e6c
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/topology.xsd
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:topology:3.2.1">topology.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 Clause 14.
+Topology is the branch of mathematics describing the properties of objects which are invariant under continuous deformation. For example, a circle is topologically equivalent to an ellipse because one can be transformed into the other by stretching. In geographic modelling, the foremost use of topology is in accelerating computational geometry. The constructs of topology allow characterisation of the spatial relationships between objects using simple combinatorial or algebraic algorithms [...]
+There are four instantiable classes of primitive topology objects, one for each dimension up to 3D. In addition, topological complexes are supported, too. 
+There is strong symmetry in the (topological boundary and coboundary) relationships between topology primitives of adjacent dimensions. Topology primitives are bounded by directed primitives of one lower dimension. The coboundary of each topology primitive is formed from directed topology primitives of one higher dimension.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+  <include schemaLocation="gml.xsd"/>
+  <include schemaLocation="geometryComplexes.xsd"/>
+  <complexType name="AbstractTopologyType" abstract="true">
+    <annotation>
+      <documentation>This abstract type supplies the root or base type for all topological elements including primitives and complexes. It inherits AbstractGMLType and hence can be identified using the gml:id attribute.</documentation>
+    </annotation>
+    <complexContent>
+      <extension base="gml:AbstractGMLType"/>
+    </complexContent>
+  </complexType>
+  <element name="AbstractTopology" type="gml:AbstractTopologyType" abstract="true" substitutionGroup="gml:AbstractGML"/>
+  <complexType name="AbstractTopoPrimitiveType" abstract="true">
+    <complexContent>
+      <extension base="gml:AbstractTopologyType"/>
+    </complexContent>
+  </complexType>
+  <element name="AbstractTopoPrimitive" type="gml:AbstractTopoPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTopology">
+    <annotation>
+      <documentation>gml:AbstractTopoPrimitive acts as the base type for all topological primitives. Topology primitives are the atomic (smallest possible) units of a topology complex. 
+Each topology primitive may contain references to other topology primitives of codimension 2 or more (gml:isolated). Conversely, nodes may have faces as containers and nodes and edges may have solids as containers (gml:container).</documentation>
+    </annotation>
+  </element>
+  <complexType name="NodeOrEdgePropertyType">
+    <choice minOccurs="0">
+      <element ref="gml:Node"/>
+      <element ref="gml:Edge"/>
+    </choice>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="NodePropertyType">
+    <choice minOccurs="0">
+      <element ref="gml:Node"/>
+    </choice>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="FaceOrTopoSolidPropertyType">
+    <choice minOccurs="0">
+      <element ref="gml:Face"/>
+      <element ref="gml:TopoSolid"/>
+    </choice>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="TopoSolidPropertyType">
+    <choice minOccurs="0">
+      <element ref="gml:TopoSolid"/>
+    </choice>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="NodeType">
+    <complexContent>
+      <extension base="gml:AbstractTopoPrimitiveType">
+        <sequence>
+          <element name="container" type="gml:FaceOrTopoSolidPropertyType" minOccurs="0"/>
+          <element ref="gml:directedEdge" minOccurs="0" maxOccurs="unbounded">
+            <annotation>
+              <documentation>In the case of planar topology, a gml:Node must have a clockwise sequence of gml:directedEdge properties, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR).</documentation>
+            </annotation>
+          </element>
+          <element ref="gml:pointProperty" minOccurs="0"/>
+        </sequence>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="Node" type="gml:NodeType" substitutionGroup="gml:AbstractTopoPrimitive">
+    <annotation>
+      <documentation>gml:Node represents the 0-dimensional primitive.
+The optional coboundary of a node (gml:directedEdge) is a sequence of directed edges which are incident on this node. Edges emanating from this node appear in the node coboundary with a negative orientation. 
+If provided, the aggregationType attribute shall have the value "sequence".
+A node may optionally be realised by a 0-dimensional geometric primitive (gml:pointProperty).</documentation>
+    </annotation>
+  </element>
+  <element name="directedNode" type="gml:DirectedNodePropertyType">
+    <annotation>
+      <documentation>A gml:directedNode property element describes the boundary of topology edges and is used in the support of topological point features via the gml:TopoPoint expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included node is used: start ("-") or end ("+") node.</documentation>
+    </annotation>
+  </element>
+  <complexType name="DirectedNodePropertyType">
+    <sequence minOccurs="0">
+      <element ref="gml:Node"/>
+    </sequence>
+    <attribute name="orientation" type="gml:SignType" default="+"/>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="EdgeType">
+    <complexContent>
+      <extension base="gml:AbstractTopoPrimitiveType">
+        <sequence>
+          <element name="container" type="gml:TopoSolidPropertyType" minOccurs="0"/>
+          <element ref="gml:directedNode" minOccurs="2" maxOccurs="2"/>
+          <element ref="gml:directedFace" minOccurs="0" maxOccurs="unbounded"/>
+          <element ref="gml:curveProperty" minOccurs="0"/>
+        </sequence>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="Edge" type="gml:EdgeType" substitutionGroup="gml:AbstractTopoPrimitive">
+    <annotation>
+      <documentation>gml:Edge represents the 1-dimensional primitive.
+The topological boundary of an Edge (gml:directedNode) consists of a negatively directed start Node and a positively directed end Node.   
+The optional coboundary of an edge (gml:directedFace) is a circular sequence of directed faces which are incident on this edge in document order. In the 2D case, the orientation of the face on the left of the edge is "+"; the orientation of the face on the right on its right is "-". 
+If provided, the aggregationType attribute shall have the value "sequence".
+An edge may optionally be realised by a 1-dimensional geometric primitive (gml:curveProperty).</documentation>
+    </annotation>
+  </element>
+  <element name="directedEdge" type="gml:DirectedEdgePropertyType">
+    <annotation>
+      <documentation>A gml:directedEdge property element describes the boundary of topology faces, the coBoundary of topology nodes and is used in the support of topological line features via the gml:TopoCurve expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included edge is used, i.e. forward or reverse.</documentation>
+    </annotation>
+  </element>
+  <complexType name="DirectedEdgePropertyType">
+    <sequence minOccurs="0">
+      <element ref="gml:Edge"/>
+    </sequence>
+    <attribute name="orientation" type="gml:SignType" default="+"/>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="FaceType">
+    <complexContent>
+      <extension base="gml:AbstractTopoPrimitiveType">
+        <sequence>
+          <element name="isolated" type="gml:NodePropertyType" minOccurs="0" maxOccurs="unbounded"/>
+          <element ref="gml:directedEdge" maxOccurs="unbounded"/>
+          <element ref="gml:directedTopoSolid" minOccurs="0" maxOccurs="2"/>
+          <element ref="gml:surfaceProperty" minOccurs="0"/>
+        </sequence>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+        <attribute name="universal" type="boolean" use="optional" default="false">
+          <annotation>
+            <documentation>If the topological representation exists an unbounded manifold (e.g. Euclidean plane), a gml:Face must indicate whether it is a universal face or not, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR). The optional universal attribute of type boolean is used to indicate this. NOTE The universal face is normally not part of any feature, and is used to represent the unbounded portion of the data set. Its in [...]
+          </annotation>
+        </attribute>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="Face" type="gml:FaceType" substitutionGroup="gml:AbstractTopoPrimitive">
+    <annotation>
+      <documentation>gml:Face represents the 2-dimensional topology primitive.
+The topological boundary of a face (gml:directedEdge) consists of a sequence of directed edges. If provided, the aggregationType attribute shall have the value "sequence".
+The optional coboundary of a face (gml:directedTopoSolid) is a pair of directed solids which are bounded by this face. A positively directed solid corresponds to a solid which lies in the direction of the negatively directed normal to the face in any geometric realisation. 
+A face may optionally be realised by a 2-dimensional geometric primitive (gml:surfaceProperty).</documentation>
+    </annotation>
+  </element>
+  <element name="directedFace" type="gml:DirectedFacePropertyType">
+    <annotation>
+      <documentation>The gml:directedFace property element describes the boundary of topology solids, in the coBoundary of topology edges and is used in the support of surface features via the gml:TopoSurface expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included face is used i.e. inward or outward with respect to the surface normal in any geometric realisation.</documentation>
+    </annotation>
+  </element>
+  <complexType name="DirectedFacePropertyType">
+    <sequence minOccurs="0">
+      <element ref="gml:Face"/>
+    </sequence>
+    <attribute name="orientation" type="gml:SignType" default="+"/>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="TopoSolidType">
+    <complexContent>
+      <extension base="gml:AbstractTopoPrimitiveType">
+        <sequence>
+          <element name="isolated" type="gml:NodeOrEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
+          <element ref="gml:directedFace" maxOccurs="unbounded"/>
+          <element ref="gml:solidProperty" minOccurs="0"/>
+        </sequence>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+        <attribute name="universal" type="boolean" use="optional" default="false">
+          <annotation>
+            <documentation>A gml:TopoSolid must indicate whether it is a universal topo-solid or not, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR). The optional universal attribute of type boolean is used to indicate this and the default is fault. NOTE The universal topo-solid is normally not part of any feature, and is used to represent the unbounded portion of the data set. Its interior boundary (it has no exterior boundary) [...]
+          </annotation>
+        </attribute>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="TopoSolid" type="gml:TopoSolidType" substitutionGroup="gml:AbstractTopoPrimitive">
+    <annotation>
+      <documentation>gml:TopoSolid represents the 3-dimensional topology primitive. 
+The topological boundary of a solid (gml:directedFace) consists of a set of directed faces.
+A solid may optionally be realised by a 3-dimensional geometric primitive (gml:solidProperty).</documentation>
+    </annotation>
+  </element>
+  <element name="directedTopoSolid" type="gml:DirectedTopoSolidPropertyType">
+    <annotation>
+      <documentation>The gml:directedSolid property element describes the coBoundary of topology faces and is used in the support of volume features via the gml:TopoVolume expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included solid appears in the face coboundary. In the context of a gml:TopoVolume the orientation attribute has no meaning.</documentation>
+    </annotation>
+  </element>
+  <complexType name="DirectedTopoSolidPropertyType">
+    <sequence minOccurs="0">
+      <element ref="gml:TopoSolid"/>
+    </sequence>
+    <attribute name="orientation" type="gml:SignType" default="+"/>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="TopoPointType">
+    <complexContent>
+      <extension base="gml:AbstractTopologyType">
+        <sequence>
+          <element ref="gml:directedNode"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="TopoPoint" type="gml:TopoPointType">
+    <annotation>
+      <documentation>The intended use of gml:TopoPoint is to appear within a point feature to express the structural and possibly geometric relationships of this feature to other features via shared node definitions.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoPointPropertyType">
+    <sequence>
+      <element ref="gml:TopoPoint"/>
+    </sequence>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <element name="topoPointProperty" type="gml:TopoPointPropertyType">
+    <annotation>
+      <documentation>The gml:topoPointProperty property element may be used in features to express their relationship to the referenced topology node.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoCurveType">
+    <complexContent>
+      <extension base="gml:AbstractTopologyType">
+        <sequence>
+          <element ref="gml:directedEdge" maxOccurs="unbounded"/>
+        </sequence>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="TopoCurve" type="gml:TopoCurveType">
+    <annotation>
+      <documentation>gml:TopoCurve represents a homogeneous topological expression, a sequence of directed edges, which if realised are isomorphic to a geometric curve primitive. The intended use of gml:TopoCurve is to appear within a line feature to express the structural and geometric relationships of this feature to other features via the shared edge definitions.
+If provided, the aggregationType attribute shall have the value "sequence".</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoCurvePropertyType">
+    <sequence>
+      <element ref="gml:TopoCurve"/>
+    </sequence>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <element name="topoCurveProperty" type="gml:TopoCurvePropertyType">
+    <annotation>
+      <documentation>The gml:topoCurveProperty property element may be used in features to express their relationship to the referenced topology edges.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoSurfaceType">
+    <complexContent>
+      <extension base="gml:AbstractTopologyType">
+        <sequence>
+          <element ref="gml:directedFace" maxOccurs="unbounded"/>
+        </sequence>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="TopoSurface" type="gml:TopoSurfaceType">
+    <annotation>
+      <documentation>gml:TopoSurface represents a homogeneous topological expression, a set of directed faces, which if realised are isomorphic to a geometric surface primitive. The intended use of gml:TopoSurface is to appear within a surface feature to express the structural and possibly geometric relationships of this surface feature to other features via the shared face definitions.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoSurfacePropertyType">
+    <sequence>
+      <element ref="gml:TopoSurface"/>
+    </sequence>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <element name="topoSurfaceProperty" type="gml:TopoSurfacePropertyType">
+    <annotation>
+      <documentation>The gml:topoSurfaceProperty property element may be used in features to express their relationship to the referenced topology faces.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoVolumeType">
+    <complexContent>
+      <extension base="gml:AbstractTopologyType">
+        <sequence>
+          <element ref="gml:directedTopoSolid" maxOccurs="unbounded"/>
+        </sequence>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="TopoVolume" type="gml:TopoVolumeType">
+    <annotation>
+      <documentation>gml:TopoVolume represents a homogeneous topological expression, a set of directed topologic solids, which if realised are isomorphic to a geometric solid primitive. The intended use of gml:TopoVolume is to appear within a solid feature to express the structural and geometric relationships of this solid feature to other features via the shared solid definitions.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoVolumePropertyType">
+    <sequence>
+      <element ref="gml:TopoVolume"/>
+    </sequence>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <element name="topoVolumeProperty" type="gml:TopoVolumePropertyType">
+    <annotation>
+      <documentation>The gml:topoVolumeProperty element may be used in features to express their relationship to the referenced topology volume.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoComplexType">
+    <complexContent>
+      <extension base="gml:AbstractTopologyType">
+        <sequence>
+          <element ref="gml:maximalComplex"/>
+          <element ref="gml:superComplex" minOccurs="0" maxOccurs="unbounded"/>
+          <element ref="gml:subComplex" minOccurs="0" maxOccurs="unbounded"/>
+          <element ref="gml:topoPrimitiveMember" minOccurs="0" maxOccurs="unbounded"/>
+          <element ref="gml:topoPrimitiveMembers" minOccurs="0"/>
+        </sequence>
+        <attribute name="isMaximal" type="boolean" default="false"/>
+        <attributeGroup ref="gml:AggregationAttributeGroup"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <element name="TopoComplex" type="gml:TopoComplexType" substitutionGroup="gml:AbstractTopology">
+    <annotation>
+      <documentation>gml:TopoComplex is a collection of topological primitives.
+Each complex holds a reference to its maximal complex (gml:maximalComplex) and optionally to sub- or super-complexes (gml:subComplex, gml:superComplex). 
+A topology complex contains its primitive and sub-complex members.
+</documentation>
+    </annotation>
+  </element>
+  <element name="subComplex" type="gml:TopoComplexPropertyType">
+    <annotation>
+      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
+    </annotation>
+  </element>
+  <element name="superComplex" type="gml:TopoComplexPropertyType">
+    <annotation>
+      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
+    </annotation>
+  </element>
+  <element name="maximalComplex" type="gml:TopoComplexPropertyType">
+    <annotation>
+      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
+    </annotation>
+  </element>
+  <element name="topoPrimitiveMember" type="gml:TopoPrimitiveMemberType">
+    <annotation>
+      <documentation>The gml:topoPrimitiveMember property element encodes for the relationship between a topology complex and a single topology primitive.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoPrimitiveMemberType">
+    <sequence minOccurs="0">
+      <element ref="gml:AbstractTopoPrimitive"/>
+    </sequence>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <element name="topoPrimitiveMembers" type="gml:TopoPrimitiveArrayAssociationType">
+    <annotation>
+      <documentation>The gml:topoPrimitiveMembers property element encodes the relationship between a topology complex and an arbitrary number of topology primitives.</documentation>
+    </annotation>
+  </element>
+  <complexType name="TopoPrimitiveArrayAssociationType">
+    <sequence minOccurs="0" maxOccurs="unbounded">
+      <element ref="gml:AbstractTopoPrimitive"/>
+    </sequence>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <complexType name="TopoComplexPropertyType">
+    <sequence minOccurs="0">
+      <element ref="gml:TopoComplex"/>
+    </sequence>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+  </complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/units.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/units.xsd
new file mode 100644
index 0000000..84eca23
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/units.xsd
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:units:3.2.1">units.xsd</appinfo>
+		<documentation>See ISO/DIS 17.2.
+Several GML Schema components concern or require a reference scale or units of measure.  Units are required for quantities that may occur as values of properties of feature types, as the results of observations, in the range parameters of a coverage, and for measures used in Coordinate Reference System definitions. 
+The basic unit definition is an extension of the general gml:Definition element defined in 16.2.1.  Three specialized elements for unit definition are further derived from this. 
+This model is based on the SI system of units [ISO 1000], which distinguishes between Base Units and Derived Units.  
+-	Base Units are the preferred units for a set of orthogonal fundamental quantities which define the particular system of units, which may not be derived by combination of other base units.  
+-	Derived Units are the preferred units for other quantities in the system, which may be defined by algebraic combination of the base units.  
+In some application areas Conventional units are used, which may be converted to the preferred units using a scaling factor or a formula which defines a re-scaling and offset.  The set of preferred units for all physical quantity types in a particular system of units is composed of the union of its base units and derived units.  
+Unit definitions are substitutable for the gml:Definition element declared as part of the dictionary model.  A dictionary that contains only unit definitions and references to unit definitions is a units dictionary.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="dictionary.xsd"/>
+	<element name="unitOfMeasure" type="gml:UnitOfMeasureType">
+		<annotation>
+			<documentation>The element gml:unitOfMeasure is a property element to refer to a unit of measure. This is an empty element which carries a reference to a unit of measure definition.</documentation>
+		</annotation>
+	</element>
+	<complexType name="UnitOfMeasureType">
+		<sequence/>
+		<attribute name="uom" type="gml:UomIdentifier" use="required"/>
+	</complexType>
+	<element name="UnitDefinition" type="gml:UnitDefinitionType" substitutionGroup="gml:Definition">
+		<annotation>
+			<documentation>A gml:UnitDefinition is a general definition of a unit of measure. This generic element is used only for units for which no relationship with other units or units systems is known.
+The content model of gml:UnitDefinition adds three additional properties to gml:Definition, gml:quantityType, gml:quantityTypeReference and gml:catalogSymbol.  
+The gml:catalogSymbol property optionally gives the short symbol used for this unit. This element is usually used when the relationship of this unit to other units or units systems is unknown.</documentation>
+		</annotation>
+	</element>
+	<complexType name="UnitDefinitionType">
+		<complexContent>
+			<extension base="gml:DefinitionType">
+				<sequence>
+					<element ref="gml:quantityType" minOccurs="0"/>
+					<element ref="gml:quantityTypeReference" minOccurs="0"/>
+					<element ref="gml:catalogSymbol" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="quantityType" type="gml:StringOrRefType">
+		<annotation>
+			<documentation>The gml:quantityType property indicates the phenomenon to which the units apply. This element contains an informal description of the phenomenon or type of physical quantity that is measured or observed. When the physical quantity is the result of an observation or measurement, this term is known as observable type or measurand.
+The use of gml:quantityType for references to remote values is deprecated.</documentation>
+		</annotation>
+	</element>
+	<element name="quantityTypeReference" type="gml:ReferenceType">
+		<annotation>
+			<documentation>The gml:quantityTypeReference property indicates the phenomenon to which the units apply. The content is a reference to a remote value.</documentation>
+		</annotation>
+	</element>
+	<element name="catalogSymbol" type="gml:CodeType">
+		<annotation>
+			<documentation>The catalogSymbol is the preferred lexical symbol used for this unit of measure.
+The codeSpace attribute in gml:CodeType identifies a namespace for the catalog symbol value, and might reference the external catalog. The string value in gml:CodeType contains the value of a symbol that should be unique within this catalog namespace. This symbol often appears explicitly in the catalog, but it could be a combination of symbols using a specified algebra of units.</documentation>
+		</annotation>
+	</element>
+	<element name="BaseUnit" type="gml:BaseUnitType" substitutionGroup="gml:UnitDefinition">
+		<annotation>
+			<documentation>A base unit is a unit of measure that cannot be derived by combination of other base units within a particular system of units.  For example, in the SI system of units, the base units are metre, kilogram, second, Ampere, Kelvin, mole, and candela, for the physical quantity types length, mass, time interval, electric current, thermodynamic temperature, amount of substance and luminous intensity, respectively.
+gml:BaseUnit extends generic gml:UnitDefinition with the property gml:unitsSystem, which carries a reference to the units system to which this base unit is asserted to belong.  </documentation>
+		</annotation>
+	</element>
+	<complexType name="BaseUnitType">
+		<complexContent>
+			<extension base="gml:UnitDefinitionType">
+				<sequence>
+					<element name="unitsSystem" type="gml:ReferenceType"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="DerivedUnit" type="gml:DerivedUnitType" substitutionGroup="gml:UnitDefinition">
+		<annotation>
+			<documentation>Derived units are defined by combination of other units.  Derived units are used for quantities other than those corresponding to the base units, such as hertz (s-1) for frequency, Newton (kg.m/s2) for force.  Derived units based directly on base units are usually preferred for quantities other than the fundamental quantities within a system. If a derived unit is not the preferred unit, the gml:ConventionalUnit element should be used instead.
+The gml:DerivedUnit extends gml:UnitDefinition with the property gml:derivationUnitTerms.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DerivedUnitType">
+		<complexContent>
+			<extension base="gml:UnitDefinitionType">
+				<sequence>
+					<element ref="gml:derivationUnitTerm" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="derivationUnitTerm" type="gml:DerivationUnitTermType">
+		<annotation>
+			<documentation>A set of gml:derivationUnitTerm elements describes a derived unit of measure.  Each element carries an integer exponent.  The terms are combined by raising each referenced unit to the power of its exponent and forming the product.
+This unit term references another unit of measure (uom) and provides an integer exponent applied to that unit in defining the compound unit. The exponent may be positive or negative, but not zero.</documentation>
+		</annotation>
+	</element>
+	<complexType name="DerivationUnitTermType">
+		<complexContent>
+			<extension base="gml:UnitOfMeasureType">
+				<attribute name="exponent" type="integer"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="ConventionalUnit" type="gml:ConventionalUnitType" substitutionGroup="gml:UnitDefinition">
+		<annotation>
+			<documentation>Conventional units that are neither base units nor defined by direct combination of base units are used in many application domains.  For example electronVolt for energy, feet and nautical miles for length.  In most cases there is a known, usually linear, conversion to a preferred unit which is either a base unit or derived by direct combination of base units.
+The gml:ConventionalUnit extends gml:UnitDefinition with a property that describes a conversion to a preferred unit for this physical quantity.  When the conversion is exact, the element gml:conversionToPreferredUnit should be used, or when the conversion is not exact the element gml:roughConversionToPreferredUnit is available. Both of these elements have the same content model.  The gml:derivationUnitTerm property defined above is included to allow a user to optionally record how this u [...]
+		</annotation>
+	</element>
+	<complexType name="ConventionalUnitType">
+		<complexContent>
+			<extension base="gml:UnitDefinitionType">
+				<sequence>
+					<choice>
+						<element ref="gml:conversionToPreferredUnit"/>
+						<element ref="gml:roughConversionToPreferredUnit"/>
+					</choice>
+					<element ref="gml:derivationUnitTerm" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="conversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
+		<annotation>
+			<documentation>The elements gml:conversionToPreferredUnit and gml:roughConversionToPreferredUnit represent parameters used to convert conventional units to preferred units for this physical quantity type.  A preferred unit is either a Base Unit or a Derived Unit that is selected for all values of one physical quantity type.</documentation>
+		</annotation>
+	</element>
+	<element name="roughConversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
+		<annotation>
+			<documentation>The elements gml:conversionToPreferredUnit and gml:roughConversionToPreferredUnit represent parameters used to convert conventional units to preferred units for this physical quantity type.  A preferred unit is either a Base Unit or a Derived Unit that is selected for all values of one physical quantity type.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ConversionToPreferredUnitType">
+		<annotation>
+			<documentation>The inherited attribute uom references the preferred unit that this conversion applies to. The conversion of a unit to the preferred unit for this physical quantity type is specified by an arithmetic conversion (scaling and/or offset). The content model extends gml:UnitOfMeasureType, which has a mandatory attribute uom which identifies the preferred unit for the physical quantity type that this conversion applies to. The conversion is specified by a choice of 
+-	gml:factor, which defines the scale factor, or
+-	gml:formula, which defines a formula 
+by which a value using the conventional unit of measure can be converted to obtain the corresponding value using the preferred unit of measure.  
+The formula defines the parameters of a simple formula by which a value using the conventional unit of measure can be converted to the corresponding value using the preferred unit of measure. The formula element contains elements a, b, c and d, whose values use the XML Schema type double. These values are used in the formula y = (a + bx) / (c + dx), where x is a value using this unit, and y is the corresponding value using the base unit. The elements a and d are optional, and if values a [...]
+		</annotation>
+		<complexContent>
+			<extension base="gml:UnitOfMeasureType">
+				<choice>
+					<element name="factor" type="double"/>
+					<element name="formula" type="gml:FormulaType"/>
+				</choice>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="FormulaType">
+		<sequence>
+			<element name="a" type="double" minOccurs="0"/>
+			<element name="b" type="double"/>
+			<element name="c" type="double"/>
+			<element name="d" type="double" minOccurs="0"/>
+		</sequence>
+	</complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/gml/3.2.1/valueObjects.xsd b/pycsw/core/schemas/ogc/gml/3.2.1/valueObjects.xsd
new file mode 100644
index 0000000..204bdfd
--- /dev/null
+++ b/pycsw/core/schemas/ogc/gml/3.2.1/valueObjects.xsd
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
+	<annotation>
+		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:valueObjects:3.2.1">valueObjects.xsd</appinfo>
+		<documentation>See ISO/DIS 19136 17.5.
+The elements declared in this Clause build on other GML schema components, in particular gml:AbstractTimeObject, gml:AbstractGeometry, and the following types:  gml:MeasureType, gml:MeasureListType, gml:CodeType, gml:CodeOrNilReasonListType, gml:BooleanOrNilReasonListType, gml:IntegerOrNilReasonList.  
+Of particular interest are elements that are the heads of substitution groups, and one named choice group. These are the primary reasons for the value objects schema, since they may act as variables in the definition of content models, such as Observations, when it is desired to permit alternative value types to occur some of which may have complex content such as arrays, geometry and time objects, and where it is useful not to prescribe the actual value type in advance. The members of t [...]
+The value objects are defined in a hierarchy. The following relationships are defined:
+-	Concrete elements gml:Quantity, gml:Category, gml:Count and gml:Boolean are substitutable for the abstract element gml:AbstractScalarValue.  
+-	Concrete elements gml:QuantityList, gml:CategoryList, gml:CountList and gml:BooleanList are substitutable for the abstract element gml:AbstractScalarValueList.  
+-	Concrete element gml:ValueArray is substitutable for the concrete element gml:CompositeValue.  
+-	Abstract elements gml:AbstractScalarValue and gml:AbstractScalarValueList, and concrete elements gml:CompositeValue, gml:ValueExtent, gml:CategoryExtent, gml:CountExtent and gml:QuantityExtent are substitutable for abstract element gml:AbstractValue.  
+-	Abstract elements gml:AbstractValue, gml:AbstractTimeObject and gml:AbstractGeometry are all in a choice group named gml:Value, which is used for compositing in gml:CompositeValue and gml:ValueExtent.  
+-	Schemas which need values may use the abstract element gml:AbstractValue in a content model in order to permit any of the gml:AbstractScalarValues, gml:AbstractScalarValueLists, gml:CompositeValue or gml:ValueExtent to occur in an instance, or the named group gml:Value to also permit gml:AbstractTimeObjects, gml:AbstractGeometrys.
+
+GML is an OGC Standard.
+Copyright (c) 2007,2010 Open Geospatial Consortium.
+To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<include schemaLocation="gml.xsd"/>
+	<include schemaLocation="geometryBasic0d1d.xsd"/>
+	<include schemaLocation="temporal.xsd"/>
+	<element name="Boolean" substitutionGroup="gml:AbstractScalarValue" nillable="true">
+		<complexType>
+			<simpleContent>
+				<extension base="boolean">
+					<attribute name="nilReason" type="gml:NilReasonType"/>
+				</extension>
+			</simpleContent>
+		</complexType>
+	</element>
+	<element name="BooleanList" type="gml:booleanOrNilReasonList" substitutionGroup="gml:AbstractScalarValueList"/>
+	<element name="Category" substitutionGroup="gml:AbstractScalarValue" nillable="true">
+		<annotation>
+			<documentation>A gml:Category has an optional XML attribute codeSpace, whose value is a URI which identifies a dictionary, codelist or authority for the term.</documentation>
+		</annotation>
+		<complexType>
+			<simpleContent>
+				<extension base="gml:CodeType">
+					<attribute name="nilReason" type="gml:NilReasonType"/>
+				</extension>
+			</simpleContent>
+		</complexType>
+	</element>
+	<element name="CategoryList" type="gml:CodeOrNilReasonListType" substitutionGroup="gml:AbstractScalarValueList"/>
+	<element name="Count" substitutionGroup="gml:AbstractScalarValue" nillable="true">
+		<complexType>
+			<simpleContent>
+				<extension base="integer">
+					<attribute name="nilReason" type="gml:NilReasonType"/>
+				</extension>
+			</simpleContent>
+		</complexType>
+	</element>
+	<element name="CountList" type="gml:integerOrNilReasonList" substitutionGroup="gml:AbstractScalarValueList"/>
+	<element name="Quantity" substitutionGroup="gml:AbstractScalarValue" nillable="true">
+		<annotation>
+			<documentation>An XML attribute uom ("unit of measure") is required, whose value is a URI which identifies the definition of a ratio scale or units by which the numeric value shall be multiplied, or an interval or position scale on which the value occurs.</documentation>
+		</annotation>
+		<complexType>
+			<simpleContent>
+				<extension base="gml:MeasureType">
+					<attribute name="nilReason" type="gml:NilReasonType"/>
+				</extension>
+			</simpleContent>
+		</complexType>
+	</element>
+	<element name="QuantityList" type="gml:MeasureOrNilReasonListType" substitutionGroup="gml:AbstractScalarValueList"/>
+	<element name="AbstractValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractObject">
+		<annotation>
+			<documentation>gml:AbstractValue is an abstract element which acts as the head of a substitution group which contains gml:AbstractScalarValue, gml:AbstractScalarValueList, gml:CompositeValue and gml:ValueExtent, and (transitively) the elements in their substitution groups.
+These elements may be used in an application schema as variables, so that in an XML instance document any member of its substitution group may occur.</documentation>
+		</annotation>
+	</element>
+	<element name="AbstractScalarValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractValue">
+		<annotation>
+			<documentation>gml:AbstractScalarValue is an abstract element which acts as the head of a substitution group which contains gml:Boolean, gml:Category, gml:Count and gml:Quantity, and (transitively) the elements in their substitution groups.</documentation>
+		</annotation>
+	</element>
+	<element name="AbstractScalarValueList" type="anyType" abstract="true" substitutionGroup="gml:AbstractValue">
+		<annotation>
+			<documentation>gml:AbstractScalarValueList is an abstract element which acts as the head of a substitution group which contains gml:BooleanList, gml:CategoryList, gml:CountList and gml:QuantityList, and (transitively) the elements in their substitution groups.</documentation>
+		</annotation>
+	</element>
+	<group name="Value">
+		<annotation>
+			<documentation>This is a convenience choice group which unifies generic values defined in this Clause with spatial and temporal objects and the measures described above, so that any of these may be used within aggregate values.</documentation>
+		</annotation>
+		<choice>
+			<element ref="gml:AbstractValue"/>
+			<element ref="gml:AbstractGeometry"/>
+			<element ref="gml:AbstractTimeObject"/>
+			<element ref="gml:Null"/>
+		</choice>
+	</group>
+	<element name="valueProperty" type="gml:ValuePropertyType">
+		<annotation>
+			<documentation>Property that refers to, or contains, a Value. Convenience element for general use.</documentation>
+		</annotation>
+	</element>
+	<element name="valueComponent" type="gml:ValuePropertyType">
+		<annotation>
+			<documentation>Property that refers to, or contains, a Value.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ValuePropertyType">
+		<sequence minOccurs="0">
+			<group ref="gml:Value"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="valueComponents" type="gml:ValueArrayPropertyType">
+		<annotation>
+			<documentation>Property that contains Values.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ValueArrayPropertyType">
+		<sequence maxOccurs="unbounded">
+			<group ref="gml:Value"/>
+		</sequence>
+		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
+	</complexType>
+	<element name="CompositeValue" type="gml:CompositeValueType" substitutionGroup="gml:AbstractValue">
+		<annotation>
+			<documentation>gml:CompositeValue is an aggregate value built from other values . It contains zero or an arbitrary number of gml:valueComponent elements, and zero or one gml:valueComponents property elements.  It may be used for strongly coupled aggregates (vectors, tensors) or for arbitrary collections of values.</documentation>
+		</annotation>
+	</element>
+	<complexType name="CompositeValueType">
+		<complexContent>
+			<extension base="gml:AbstractGMLType">
+				<sequence>
+					<element ref="gml:valueComponent" minOccurs="0" maxOccurs="unbounded"/>
+					<element ref="gml:valueComponents" minOccurs="0"/>
+				</sequence>
+				<attributeGroup ref="gml:AggregationAttributeGroup"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="ValueArray" type="gml:ValueArrayType" substitutionGroup="gml:CompositeValue">
+		<annotation>
+			<documentation>A Value Array is used for homogeneous arrays of primitive and aggregate values.  
+The member values may be scalars, composites, arrays or lists.
+ValueArray has the same content model as CompositeValue, but the member values shall be homogeneous.  The element declaration contains a Schematron constraint which expresses this restriction precisely.  Since the members are homogeneous, the gml:referenceSystem (uom, codeSpace) may be specified on the gml:ValueArray itself and inherited by all the members if desired.</documentation>
+		</annotation>
+	</element>
+	<complexType name="ValueArrayType">
+		<complexContent>
+			<extension base="gml:CompositeValueType">
+				<attributeGroup ref="gml:referenceSystem"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<attributeGroup name="referenceSystem">
+		<attribute name="codeSpace" type="anyURI"/>
+		<attribute name="uom" type="gml:UomIdentifier"/>
+	</attributeGroup>
+	<element name="CategoryExtent" type="gml:CategoryExtentType" substitutionGroup="gml:AbstractValue"/>
+	<complexType name="CategoryExtentType">
+		<simpleContent>
+			<restriction base="gml:CodeOrNilReasonListType">
+				<length value="2"/>
+			</restriction>
+		</simpleContent>
+	</complexType>
+	<element name="CountExtent" type="gml:CountExtentType" substitutionGroup="gml:AbstractValue"/>
+	<simpleType name="CountExtentType">
+		<restriction base="gml:integerOrNilReasonList">
+			<length value="2"/>
+		</restriction>
+	</simpleType>
+	<element name="QuantityExtent" type="gml:QuantityExtentType" substitutionGroup="gml:AbstractValue"/>
+	<complexType name="QuantityExtentType">
+		<simpleContent>
+			<restriction base="gml:MeasureOrNilReasonListType">
+				<length value="2"/>
+			</restriction>
+		</simpleContent>
+	</complexType>
+	<complexType name="BooleanPropertyType">
+		<sequence minOccurs="0">
+			<element ref="gml:Boolean"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<complexType name="CategoryPropertyType">
+		<sequence minOccurs="0">
+			<element ref="gml:Category"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<complexType name="QuantityPropertyType">
+		<sequence minOccurs="0">
+			<element ref="gml:Quantity"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+	<complexType name="CountPropertyType">
+		<sequence minOccurs="0">
+			<element ref="gml:Count"/>
+		</sequence>
+		<attributeGroup ref="gml:AssociationAttributeGroup"/>
+	</complexType>
+</schema>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/ows19115subset.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/ows19115subset.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/ows19115subset.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/ows19115subset.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsAll.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsAll.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsAll.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsAll.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsCommon.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsCommon.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsCommon.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsCommon.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsDataIdentification.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsDataIdentification.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsDataIdentification.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsDataIdentification.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsExceptionReport.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsExceptionReport.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsExceptionReport.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsExceptionReport.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsOperationsMetadata.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsOperationsMetadata.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsOperationsMetadata.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsOperationsMetadata.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsServiceIdentification.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsServiceIdentification.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsServiceIdentification.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsServiceIdentification.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsServiceProvider.xsd b/pycsw/core/schemas/ogc/ows/1.0.0/owsServiceProvider.xsd
similarity index 100%
copy from pycsw/schemas/ogc/ows/1.0.0/owsServiceProvider.xsd
copy to pycsw/core/schemas/ogc/ows/1.0.0/owsServiceProvider.xsd
diff --git a/pycsw/schemas/ogc/ows/1.0.0/ows19115subset.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/ows19115subset.xsd
similarity index 85%
rename from pycsw/schemas/ogc/ows/1.0.0/ows19115subset.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/ows19115subset.xsd
index 7f15aed..5e2c697 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/ows19115subset.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/ows19115subset.xsd
@@ -1,32 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
 xmlns:xlink="http://www.w3.org/1999/xlink" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>ows19115subset.xsd 2010-01-30</appinfo>
-		<documentation>This XML Schema Document encodes the parts of ISO 19115 used by the common "ServiceIdentification" and "ServiceProvider" sections of the GetCapabilities operation response, known as the service metadata XML document. The parts encoded here are the MD_Keywords, CI_ResponsibleParty, and related classes. This XML Schema largely follows the current draft for ISO 19139, with the addition of documentation text extracted and edited from Annex B of ISO 19115. The UML package pre [...]
+		<appinfo>ows19115subset.xsd</appinfo>
+		<documentation>This XML Schema Document encodes the parts of ISO 19115 used by the common "ServiceIdentification" and "ServiceProvider" sections of the GetCapabilities operation response, known as the service metadata XML document. The parts encoded here are the MD_Keywords, CI_ResponsibleParty, and related classes. The UML package prefixes were omitted from XML names, and the XML element names were all capitalized, for consistency with other OWS Schemas. This document also provides a  [...]
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
+    <include schemaLocation="owsAll.xsd"/>
 	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../../w3c/1999/xlink.xsd"/>
+	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../../../w3c/2001/xml.xsd"/>
 	<!-- ==============================================================
 		elements and types
 	============================================================== -->
-	<element name="Title" type="string">
+	<complexType name="LanguageStringType">
+		<annotation>
+			<documentation>Text string with the language of the string identified as recommended in the XML 1.0 W3C Recommendation, section 2.12. </documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="string">
+				<attribute ref="xml:lang" use="optional"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<!-- =========================================================== -->
+	<element name="Title" type="ows:LanguageStringType">
 		<annotation>
 			<documentation>Title of this resource, normally used for display to a human. </documentation>
 		</annotation>
 	</element>
 	<!-- =========================================================== -->
-	<element name="Abstract" type="string">
+	<element name="Abstract" type="ows:LanguageStringType">
 		<annotation>
 			<documentation>Brief narrative description of this resource, normally used for display to a human. </documentation>
 		</annotation>
@@ -36,18 +49,19 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 	<!-- =========================================================== -->
 	<complexType name="KeywordsType">
 		<annotation>
-			<documentation>Unordered list of one or more commonly used or formalised word(s) or phrase(s) used to describe the subject. When needed, the optional "type" can name the type of the associated list of keywords that shall all have the same type. Also when needed, the codeSpace attribute of that "type" can reference the type name authority and/or thesaurus. </documentation>
+			<documentation>Unordered list of one or more commonly used or formalised word(s) or phrase(s) used to describe the subject. When needed, the optional "type" can name the type of the associated list of keywords that shall all have the same type. Also when needed, the codeSpace attribute of that "type" can reference the type name authority and/or thesaurus.
+			If the xml:lang attribute is not included in a Keyword element, then no language is specified for that element unless specified by another means.  All Keyword elements in the same Keywords element that share the same xml:lang attribute value represent different keywords in that language. </documentation>
 			<documentation>For OWS use, the optional thesaurusName element was omitted as being complex information that could be referenced by the codeSpace attribute of the Type element. </documentation>
 		</annotation>
 		<sequence>
-			<element name="Keyword" type="string" maxOccurs="unbounded"/>
+			<element name="Keyword" type="ows:LanguageStringType" maxOccurs="unbounded"/>
 			<element name="Type" type="ows:CodeType" minOccurs="0"/>
 		</sequence>
 	</complexType>
 	<!-- =========================================================== -->
 	<complexType name="CodeType">
 		<annotation>
-			<documentation>Name or code with an (optional) authority. If the codeSpace attribute is present, its value should reference a dictionary, thesaurus, or authority for the name or code, such as the organisation who assigned the value, or the dictionary from which it is taken. </documentation>
+			<documentation>Name or code with an (optional) authority. If the codeSpace attribute is present, its value shall reference a dictionary, thesaurus, or authority for the name or code, such as the organisation who assigned the value, or the dictionary from which it is taken. </documentation>
 			<documentation>Type copied from basicTypes.xsd of GML 3 with documentation edited, for possible use outside the ServiceIdentification section of a service metadata document. </documentation>
 		</annotation>
 		<simpleContent>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsAll.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsAll.xsd
similarity index 58%
rename from pycsw/schemas/ogc/ows/1.0.0/owsAll.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsAll.xsd
index f7cd634..a2fbd77 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsAll.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsAll.xsd
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>owsAll.xsd 2010-01-30</appinfo>
+		<appinfo>owsAll.xsd</appinfo>
 		<documentation>This XML Schema Document includes and imports, directly and indirectly, all the XML Schemas defined by the OWS Common Implemetation Specification.
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
-	<include schemaLocation="owsGetCapabilities.xsd"/>
+	<include schemaLocation="owsGetResourceByID.xsd"/>
 	<include schemaLocation="owsExceptionReport.xsd"/>
+	<include schemaLocation="owsDomainType.xsd"/>
+	<include schemaLocation="owsContents.xsd"/>
+	<include schemaLocation="owsInputOutputData.xsd"/>
 </schema>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsCommon.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsCommon.xsd
similarity index 96%
rename from pycsw/schemas/ogc/ows/1.0.0/owsCommon.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsCommon.xsd
index acf1d59..9de773a 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsCommon.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsCommon.xsd
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
 xmlns:xlink="http://www.w3.org/1999/xlink" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>owsCommon.xsd 2010-01-30</appinfo>
+		<appinfo>owsCommon.xsd</appinfo>
 		<documentation>This XML Schema Document encodes various parameters and parameter types that can be used in OWS operation requests and responses.
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
+    <include schemaLocation="owsAll.xsd"/>
 	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../../w3c/1999/xlink.xsd"/>
 	<!-- ==============================================================
 		elements and types
@@ -33,7 +34,9 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 		<annotation>
 			<documentation>Specification version for OWS operation. The string value shall contain one x.y.z "version" value (e.g., "2.1.3"). A version number shall contain three non-negative integers separated by decimal points, in the form "x.y.z". The integers y and z shall not exceed 99. Each version shall be for the Implementation Specification (document) and the associated XML Schemas to which requested operations will conform. An Implementation Specification version normally specifies XML  [...]
 		</annotation>
-		<restriction base="string"/>
+		<restriction base="string">
+			<pattern value="\d+\.\d?\d\.\d?\d"/>
+		</restriction>
 	</simpleType>
 	<!-- ========================================================== -->
 	<element name="Metadata" type="ows:MetadataType"/>
diff --git a/pycsw/core/schemas/ogc/ows/1.1.0/owsContents.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsContents.xsd
new file mode 100644
index 0000000..5a1f47b
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsContents.xsd
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/1.1"
+xmlns:ows="http://www.opengis.net/ows/1.1"
+xmlns:xlink="http://www.w3.org/1999/xlink"
+xmlns="http://www.w3.org/2001/XMLSchema"
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
+	<annotation>
+		<appinfo>owsContents.xsd</appinfo>
+		<documentation>This XML Schema  Document encodes the typical Contents section of an OWS service metadata (Capabilities) document. This  Schema can be built upon to define the Contents section for a specific OWS. If the ContentsBaseType in this XML Schema cannot be restricted and extended to define the Contents section for a specific OWS, all other relevant parts defined in owsContents.xsd shall be used by the "ContentsType" in the wxsContents.xsd prepared for the specific OWS.
+		
+		OWS is an OGC Standard.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<!-- ==============================================================
+		includes and imports
+	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
+	<include schemaLocation="owsDataIdentification.xsd"/>
+	<!-- ==============================================================
+		elements and types
+	============================================================== -->
+	<complexType name="ContentsBaseType">
+		<annotation>
+			<documentation>Contents of typical Contents section of an OWS service metadata (Capabilities) document. This type shall be extended and/or restricted if needed for specific OWS use to include the specific metadata needed. </documentation>
+		</annotation>
+		<sequence>
+			<element ref="ows:DatasetDescriptionSummary" minOccurs="0" maxOccurs="unbounded">
+				<annotation>
+					<documentation>Unordered set of summary descriptions for the datasets available from this OWS server. This set shall be included unless another source is referenced and all this metadata is available from that source. </documentation>
+				</annotation>
+			</element>
+			<element ref="ows:OtherSource" minOccurs="0" maxOccurs="unbounded">
+				<annotation>
+					<documentation>Unordered set of references to other sources of metadata describing the coverage offerings available from this server. </documentation>
+				</annotation>
+			</element>
+		</sequence>
+	</complexType>
+	<!-- ===========================================================-->
+	<element name="OtherSource" type="ows:MetadataType">
+		<annotation>
+			<documentation>Reference to a source of metadata describing  coverage offerings available from this server. This  parameter can reference a catalogue server from which dataset metadata is available. This ability is expected to be used by servers with thousands or millions of datasets, for which searching a catalogue is more feasible than fetching a long Capabilities XML document. When no DatasetDescriptionSummaries are included, and one or more catalogue servers are referenced, this s [...]
+		</annotation>
+	</element>
+	<!-- ===========================================================-->
+	<element name="DatasetDescriptionSummary" type="ows:DatasetDescriptionSummaryBaseType"/>
+	<!-- ===========================================================-->
+	<complexType name="DatasetDescriptionSummaryBaseType">
+		<annotation>
+			<documentation>Typical dataset metadata in typical Contents section of an OWS service metadata (Capabilities) document. This type shall be extended and/or restricted if needed for specific OWS use, to include the specific Dataset  description metadata needed. </documentation>
+		</annotation>
+		<complexContent>
+			<extension base="ows:DescriptionType">
+				<sequence>
+					<element ref="ows:WGS84BoundingBox" minOccurs="0" maxOccurs="unbounded">
+						<annotation>
+							<documentation>Unordered list of zero or more minimum bounding rectangles surrounding coverage data, using the WGS 84 CRS with decimal degrees and longitude before latitude. If no WGS 84 bounding box is recorded for a coverage, any such bounding boxes recorded for a higher level in a hierarchy of datasets shall apply to this coverage. If WGS 84 bounding box(es) are recorded for a coverage, any such bounding boxes recorded for a higher level in a hierarchy of datasets shall be igno [...]
+						</annotation>
+					</element>
+					<element name="Identifier" type="ows:CodeType">
+						<annotation>
+							<documentation>Unambiguous identifier or name of this coverage, unique for this server. </documentation>
+						</annotation>
+					</element>
+					<element ref="ows:BoundingBox" minOccurs="0" maxOccurs="unbounded">
+						<annotation>
+							<documentation>Unordered list of zero or more minimum bounding rectangles surrounding coverage data, in AvailableCRSs.  Zero or more BoundingBoxes are  allowed in addition to one or more WGS84BoundingBoxes to allow more precise specification of the Dataset area in AvailableCRSs. These Bounding Boxes shall not use any CRS not listed as an AvailableCRS. However, an AvailableCRS can be listed without a corresponding Bounding Box. If no such bounding box is recorded for a coverage, an [...]
+						</annotation>
+					</element>
+					<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
+						<annotation>
+							<documentation>Optional unordered list of additional metadata about this dataset. A list of optional metadata elements for this dataset description could be specified in the Implementation Specification for this service. </documentation>
+						</annotation>
+					</element>
+					<element ref="ows:DatasetDescriptionSummary" minOccurs="0" maxOccurs="unbounded">
+						<annotation>
+							<documentation>Metadata describing zero or more unordered subsidiary datasets available from this server. </documentation>
+						</annotation>
+					</element>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<!-- ===========================================================-->
+</schema>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsDataIdentification.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsDataIdentification.xsd
similarity index 73%
rename from pycsw/schemas/ogc/ows/1.0.0/owsDataIdentification.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsDataIdentification.xsd
index e927185..b28c4c3 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsDataIdentification.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsDataIdentification.xsd
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
+xmlns:xlink="http://www.w3.org/1999/xlink" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>owsDataIdentification.xsd 2010-01-30</appinfo>
-		<documentation>This XML Schema Document encodes the parts of the MD_DataIdentification class of ISO 19115 (OGC Abstract Specification Topic 11) which are expected to be used for most datasets. This Schema also encodes the parts of this class that are expected to be useful for other metadata. Both are expected to be used within the Contents section of OWS service metadata (Capabilities) documents.
+		<appinfo>owsDataIdentification.xsd</appinfo>
+		<documentation>This XML Schema Document encodes the parts of the MD_DataIdentification class of ISO 19115 (OGC Abstract Specification Topic 11) which are expected to be used for most datasets. This Schema also encodes the parts of this class that are expected to be useful for other metadata. Both may be used within the Contents section of OWS service metadata (Capabilities) documents.
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
 	<include schemaLocation="owsCommon.xsd"/>
 	<include schemaLocation="ows19115subset.xsd"/>
 	<!-- ==============================================================
@@ -23,18 +25,19 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 	<complexType name="DescriptionType">
 		<annotation>
 			<documentation>Human-readable descriptive information for the object it is included within.
-This type shall be extended if needed for specific OWS use to include additional metadata for each type of information. This type shall not be restricted for a specific OWS to change the multiplicity (or optionality) of some elements. </documentation>
+This type shall be extended if needed for specific OWS use to include additional metadata for each type of information. This type shall not be restricted for a specific OWS to change the multiplicity (or optionality) of some elements.
+			If the xml:lang attribute is not included in a Title, Abstract or Keyword element, then no language is specified for that element unless specified by another means.  All Title, Abstract and Keyword elements in the same Description that share the same xml:lang attribute value represent the description of the parent object in that language. Multiple Title or Abstract elements shall not exist in the same Description with the same xml:lang attribute value unless otherwise specified. </doc [...]
 		</annotation>
 		<sequence>
-			<element ref="ows:Title" minOccurs="0"/>
-			<element ref="ows:Abstract" minOccurs="0"/>
+			<element ref="ows:Title" minOccurs="0" maxOccurs="unbounded"/>
+			<element ref="ows:Abstract" minOccurs="0" maxOccurs="unbounded"/>
 			<element ref="ows:Keywords" minOccurs="0" maxOccurs="unbounded"/>
 		</sequence>
 	</complexType>
 	<!-- ========================================================= -->
-	<complexType name="IdentificationType">
+	<complexType name="BasicIdentificationType">
 		<annotation>
-			<documentation>General metadata identifying and describing a set of data. This type shall be extended if needed for each specific OWS to include additional metadata for each type of dataset. If needed, this type should first be restricted for each specific OWS to change the multiplicity (or optionality) of some elements. </documentation>
+			<documentation>Basic metadata identifying and describing a set of data. </documentation>
 		</annotation>
 		<complexContent>
 			<extension base="ows:DescriptionType">
@@ -44,6 +47,23 @@ This type shall be extended if needed for specific OWS use to include additional
 							<documentation>Optional unique identifier or name of this dataset. </documentation>
 						</annotation>
 					</element>
+					<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
+						<annotation>
+							<documentation>Optional unordered list of additional metadata about this data(set). A list of optional metadata elements for this data identification could be specified in the Implementation Specification for this service. </documentation>
+						</annotation>
+					</element>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<!-- ========================================================= -->
+	<complexType name="IdentificationType">
+		<annotation>
+			<documentation>Extended metadata identifying and describing a set of data. This type shall be extended if needed for each specific OWS to include additional metadata for each type of dataset. If needed, this type should first be restricted for each specific OWS to change the multiplicity (or optionality) of some elements. </documentation>
+		</annotation>
+		<complexContent>
+			<extension base="ows:BasicIdentificationType">
+				<sequence>
 					<element ref="ows:BoundingBox" minOccurs="0" maxOccurs="unbounded">
 						<annotation>
 							<documentation>Unordered list of zero or more bounding boxes whose union describes the extent of this dataset. </documentation>
@@ -59,11 +79,6 @@ This type shall be extended if needed for specific OWS use to include additional
 							<documentation>Unordered list of zero or more available coordinate reference systems. </documentation>
 						</annotation>
 					</element>
-					<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Optional unordered list of additional metadata about this data(set). A list of optional metadata elements for this data identification could be specified in the Implementation Specification for this service. </documentation>
-						</annotation>
-					</element>
 				</sequence>
 			</extension>
 		</complexContent>
@@ -106,7 +121,8 @@ This type shall be extended if needed for specific OWS use to include additional
 	<!-- ========================================================== -->
 	<element name="Language" type="language">
 		<annotation>
-			<documentation>Identifier of a language used by the data(set) contents. This language identifier shall be as specified in IETF RFC 1766. When this element is omitted, the language used is not identified. </documentation>
+			<documentation>Identifier of a language used by the data(set) contents. This language identifier shall be as specified in IETF RFC 4646. When this element is omitted, the language used is not identified. </documentation>
 		</annotation>
 	</element>
+	<!-- ========================================================== -->
 </schema>
diff --git a/pycsw/core/schemas/ogc/ows/1.1.0/owsDomainType.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsDomainType.xsd
new file mode 100644
index 0000000..7d9419c
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsDomainType.xsd
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
+xmlns:xlink="http://www.w3.org/1999/xlink" 
+xmlns="http://www.w3.org/2001/XMLSchema" 
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
+	<annotation>
+		<appinfo>owsDomainType.xsd</appinfo>
+		<documentation>This XML Schema Document encodes the allowed values (or domain) of a quantity, often for an input or output parameter to an OWS. Such a parameter is sometimes called a variable, quantity, literal, or typed literal. Such a parameter can use one of many data types, including double, integer, boolean, string, or URI. The allowed values can also be encoded for a quantity that is not explicit or not transferred, but is constrained by a server implementation.
+		
+		OWS is an OGC Standard.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<!-- ==============================================================
+		includes and imports
+	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
+	<include schemaLocation="owsCommon.xsd"></include>
+	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../../w3c/1999/xlink.xsd"></import>
+	<!-- ==============================================================
+		elements and types
+	============================================================== -->
+	<complexType name="DomainType">
+		<annotation>
+			<documentation>Valid domain (or allowed set of values) of one quantity, with its name or identifier. </documentation>
+		</annotation>
+		<complexContent>
+			<extension base="ows:UnNamedDomainType">
+				<attribute name="name" type="string" use="required">
+					<annotation>
+						<documentation>Name or identifier of this quantity. </documentation>
+					</annotation>
+				</attribute>
+			</extension>
+		</complexContent>
+	</complexType>
+	<!-- ========================================================== -->
+	<complexType name="UnNamedDomainType">
+		<annotation>
+			<documentation>Valid domain (or allowed set of values) of one quantity, with needed metadata but without a quantity name or identifier. </documentation>
+		</annotation>
+		<sequence>
+			<group ref="ows:PossibleValues"/>
+			<element ref="ows:DefaultValue" minOccurs="0">
+				<annotation>
+					<documentation>Optional default value for this quantity, which should be included when this quantity has a default value. </documentation>
+				</annotation>
+			</element>
+			<element ref="ows:Meaning" minOccurs="0">
+				<annotation>
+					<documentation>Meaning metadata should be referenced or included for each quantity. </documentation>
+				</annotation>
+			</element>
+			<element ref="ows:DataType" minOccurs="0">
+				<annotation>
+					<documentation>This data type metadata should be referenced or included for each quantity. </documentation>
+				</annotation>
+			</element>
+			<group ref="ows:ValuesUnit" minOccurs="0">
+				<annotation>
+					<documentation>Unit of measure, which should be included when this set of PossibleValues has units or a more complete reference system. </documentation>
+				</annotation>
+			</group>
+			<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
+				<annotation>
+					<documentation>Optional unordered list of other metadata about this quantity. A list of required and optional other metadata elements for this quantity should be specified in the Implementation Specification for this service. </documentation>
+				</annotation>
+			</element>
+		</sequence>
+	</complexType>
+	<!-- ========================================================== -->
+	<group name="PossibleValues">
+		<annotation>
+			<documentation>Specifies the possible values of this quantity. </documentation>
+		</annotation>
+			<choice>
+				<element ref="ows:AllowedValues"/>
+				<element ref="ows:AnyValue"/>
+				<element ref="ows:NoValues"/>
+				<element ref="ows:ValuesReference"/>
+			</choice>
+	</group>
+	<!-- ========================================================== -->
+	<element name="AnyValue">
+		<annotation>
+			<documentation>Specifies that any value is allowed for this parameter.</documentation>
+		</annotation>
+		<complexType></complexType>
+	</element>
+	<!-- ========================================================== -->
+	<element name="NoValues">
+		<annotation>
+			<documentation>Specifies that no values are allowed for this parameter or quantity.</documentation>
+		</annotation>
+		<complexType></complexType>
+	</element>
+	<!-- ========================================================== -->
+	<element name="ValuesReference">
+		<annotation>
+			<documentation>Reference to externally specified list of all the valid values and/or ranges of values for this quantity. (Informative: This element was simplified from the metaDataProperty element in GML 3.0.) </documentation>
+		</annotation>
+		<complexType>
+			<simpleContent>
+				<extension base="string">
+					<annotation>
+						<documentation>Human-readable name of the list of values provided by the referenced document. Can be empty string when this list has no name. </documentation>
+					</annotation>
+					<attribute ref="ows:reference" use="required">
+					</attribute>
+				</extension>
+			</simpleContent>
+		</complexType>
+	</element>
+	<!-- ========================================================== -->
+	<group name="ValuesUnit">
+		<annotation>
+			<documentation>Indicates that this quantity has units or a reference system, and identifies the unit or reference system used by the AllowedValues or ValuesReference. </documentation>
+		</annotation>
+			<choice>
+				<element ref="ows:UOM">
+					<annotation>
+						<documentation>Identifier of unit of measure of this set of values. Should be included then this set of values has units (and not a more complete reference system). </documentation>
+					</annotation>
+				</element>
+				<element ref="ows:ReferenceSystem">
+					<annotation>
+						<documentation>Identifier of reference system used by this set of values. Should be included then this set of values has a reference system (not just units). </documentation>
+					</annotation>
+				</element>
+			</choice>
+	</group>
+	<!-- ========================================================== -->
+	<!-- ========================================================== -->
+	<element name="AllowedValues">
+		<annotation>
+			<documentation>List of all the valid values and/or ranges of values for this quantity. For numeric quantities, signed values should be ordered from negative infinity to positive infinity. </documentation>
+		</annotation>
+		<complexType>
+			<choice maxOccurs="unbounded">
+				<element ref="ows:Value"/>
+				<element ref="ows:Range"/>
+			</choice>
+		</complexType>
+	</element>
+	<!-- ========================================================== -->
+	<element name="Value" type="ows:ValueType"></element>
+	<!-- ========================================================== -->
+	<complexType name="ValueType">
+		<annotation>
+			<documentation>A single value, encoded as a string. This type can be used for one value, for a spacing between allowed values, or for the default value of a parameter. </documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="string"></extension>
+		</simpleContent>
+	</complexType>
+	<!-- ========================================================== -->
+	<element name="DefaultValue" type="ows:ValueType">
+		<annotation>
+			<documentation>The default value for a quantity for which multiple values are allowed. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="Range" type="ows:RangeType"></element>
+	<!-- ========================================================== -->
+	<complexType name="RangeType">
+		<annotation>
+			<documentation>A range of values of a numeric parameter. This range can be continuous or discrete, defined by a fixed spacing between adjacent valid values. If the MinimumValue or MaximumValue is not included, there is no value limit in that direction. Inclusion of the specified minimum and maximum values in the range shall be defined by the rangeClosure. </documentation>
+		</annotation>
+		<sequence>
+			<element ref="ows:MinimumValue" minOccurs="0"></element>
+			<element ref="ows:MaximumValue" minOccurs="0"></element>
+			<element ref="ows:Spacing" minOccurs="0">
+				<annotation>
+					<documentation>Shall be included when the allowed values are NOT continuous in this range. Shall not be included when the allowed values are continuous in this range. </documentation>
+				</annotation>
+			</element>
+		</sequence>
+		<attribute ref="ows:rangeClosure" use="optional">
+			<annotation>
+				<documentation>Shall be included unless the default value applies. </documentation>
+			</annotation>
+		</attribute>
+	</complexType>
+	<!-- ========================================================== -->
+	<element name="MinimumValue" type="ows:ValueType">
+		<annotation>
+			<documentation>Minimum value of this numeric parameter. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="MaximumValue" type="ows:ValueType">
+		<annotation>
+			<documentation>Maximum value of this numeric parameter. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="Spacing" type="ows:ValueType">
+		<annotation>
+			<documentation>The regular distance or spacing between the allowed values in a range. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<attribute name="rangeClosure" default="closed">
+		<annotation>
+			<documentation>Specifies which of the minimum and maximum values are included in the range. Note that plus and minus infinity are considered closed bounds. </documentation>
+		</annotation>
+		<simpleType>
+			<restriction base="NMTOKENS">
+				<enumeration value="closed">
+					<annotation>
+						<documentation>The specified minimum and maximum values are included in this range. </documentation>
+					</annotation>
+				</enumeration>
+				<enumeration value="open">
+					<annotation>
+						<documentation>The specified minimum and maximum values are NOT included in this range. </documentation>
+					</annotation>
+				</enumeration>
+				<enumeration value="open-closed">
+					<annotation>
+						<documentation>The specified minimum value is NOT included in this range, and the specified maximum value IS included in this range. </documentation>
+					</annotation>
+				</enumeration>
+				<enumeration value="closed-open">
+					<annotation>
+						<documentation>The specified minimum value IS included in this range, and the specified maximum value is NOT included in this range. </documentation>
+					</annotation>
+				</enumeration>
+			</restriction>
+		</simpleType>
+	</attribute>
+	<!-- ========================================================== -->
+	<!-- ========================================================== -->
+	<complexType name="DomainMetadataType">
+		<annotation>
+			<documentation>References metadata about a quantity, and provides a name for this metadata. (Informative: This element was simplified from the metaDataProperty element in GML 3.0.) </documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="string">
+				<annotation>
+					<documentation>Human-readable name of the metadata described by associated referenced document. </documentation>
+				</annotation>
+				<attribute ref="ows:reference" use="optional"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<!-- ========================================================== -->
+	<attribute name="reference" type="anyURI">
+		<annotation>
+			<documentation>Reference to data or metadata recorded elsewhere, either external to this XML document or within it. Whenever practical, this attribute should be a URL from which this metadata can be electronically retrieved. Alternately, this attribute can reference a URN for well-known metadata. For example, such a URN could be a URN defined in the "ogc" URN namespace. </documentation>
+		</annotation>
+	</attribute>
+	<!-- ========================================================== -->
+	<element name="Meaning" type="ows:DomainMetadataType">
+		<annotation>
+			<documentation>Definition of the meaning or semantics of this set of values. This Meaning can provide more specific, complete, precise, machine accessible, and machine understandable semantics about this quantity, relative to other available semantic information. For example, other semantic information is often provided in "documentation" elements in XML Schemas or "description" elements in GML objects. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="DataType" type="ows:DomainMetadataType">
+		<annotation>
+			<documentation>Definition of the data type of this set of values. In this case, the xlink:href attribute can reference a URN for a well-known data type. For example, such a URN could be a data type identification URN defined in the "ogc" URN namespace. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="ReferenceSystem" type="ows:DomainMetadataType">
+		<annotation>
+			<documentation>Definition of the reference system used by this set of values, including the unit of measure whenever applicable (as is normal). In this case, the xlink:href attribute can reference a URN for a well-known reference system, such as for a coordinate reference system (CRS). For example, such a URN could be a CRS identification URN defined in the "ogc" URN namespace. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="UOM" type="ows:DomainMetadataType">
+		<annotation>
+			<documentation>Definition of the unit of measure of this set of values. In this case, the xlink:href attribute can reference a URN for a well-known unit of measure (uom). For example, such a URN could be a UOM identification URN defined in the "ogc" URN namespace. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+</schema>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsExceptionReport.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsExceptionReport.xsd
similarity index 82%
rename from pycsw/schemas/ogc/ows/1.0.0/owsExceptionReport.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsExceptionReport.xsd
index eda60e4..a0811cf 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsExceptionReport.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsExceptionReport.xsd
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0 2011-02-07" xml:lang="en">
 	<annotation>
-		<appinfo>owsExceptionReport.xsd 2010-01-30</appinfo>
+		<appinfo>owsExceptionReport.xsd</appinfo>
 		<documentation>This XML Schema Document encodes the Exception Report response to all OWS operations.
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
+		includes and imports
+	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
+	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../../../w3c/2001/xml.xsd"/>
+	<!-- ==============================================================
 		elements and types
 	============================================================== -->
 	<element name="ExceptionReport">
@@ -27,14 +32,19 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 					</annotation>
 				</element>
 			</sequence>
-			<attribute name="version" type="string" use="required">
+			<attribute name="version" use="required">
 				<annotation>
 					<documentation>Specification version for OWS operation. The string value shall contain one x.y.z "version" value (e.g., "2.1.3"). A version number shall contain three non-negative integers separated by decimal points, in the form "x.y.z". The integers y and z shall not exceed 99. Each version shall be for the Implementation Specification (document) and the associated XML Schemas to which requested operations will conform. An Implementation Specification version normally specifies XM [...]
 				</annotation>
+				<simpleType>
+					<restriction base="string">
+						<pattern value="\d+\.\d?\d\.\d?\d"/>
+					</restriction>
+				</simpleType>
 			</attribute>
-			<attribute name="language" type="language" use="optional">
+			<attribute ref="xml:lang" use="optional">
 				<annotation>
-					<documentation>Identifier of the language used by all included exception text values. These language identifiers shall be as specified in IETF RFC 1766. When this attribute is omitted, the language used is not identified. </documentation>
+					<documentation>Identifier of the language used by all included exception text values. These language identifiers shall be as specified in IETF RFC 4646. When this attribute is omitted, the language used is not identified. </documentation>
 				</annotation>
 			</attribute>
 		</complexType>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsGetCapabilities.xsd
similarity index 90%
rename from pycsw/schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsGetCapabilities.xsd
index aa01b44..4ab69a6 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsGetCapabilities.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsGetCapabilities.xsd
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>owsGetCapabilities.xsd 2010-01-30</appinfo>
+		<appinfo>owsGetCapabilities.xsd</appinfo>
 		<documentation>This XML Schema Document defines the GetCapabilities operation request and response XML elements and types, which are common to all OWSs. This XML Schema shall be edited by each OWS, for example, to specify a specific value for the "service" attribute.
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
 	<include schemaLocation="owsServiceIdentification.xsd"/>
 	<include schemaLocation="owsServiceProvider.xsd"/>
 	<include schemaLocation="owsOperationsMetadata.xsd"/>
@@ -31,7 +32,11 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 			<element ref="ows:OperationsMetadata" minOccurs="0"/>
 		</sequence>
 		<attribute name="version" type="ows:VersionType" use="required"/>
-		<attribute name="updateSequence" type="ows:UpdateSequenceType" use="optional"/>
+		<attribute name="updateSequence" type="ows:UpdateSequenceType" use="optional">
+			<annotation>
+				<documentation>Service metadata document version, having values that are "increased" whenever any change is made in service metadata document. Values are selected by each server, and are always opaque to clients. When not supported by server, server shall not return this attribute. </documentation>
+			</annotation>
+		</attribute>
 	</complexType>
 	<!-- =========================================================== -->
 	<element name="GetCapabilities" type="ows:GetCapabilitiesType"/>
diff --git a/pycsw/core/schemas/ogc/ows/1.1.0/owsGetResourceByID.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsGetResourceByID.xsd
new file mode 100644
index 0000000..553601a
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsGetResourceByID.xsd
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
+xmlns="http://www.w3.org/2001/XMLSchema" 
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
+	<annotation>
+		<appinfo>owsGetResourceByID.xsd</appinfo>
+		<documentation>This XML Schema Document encodes the GetResourceByID operation request message. This typical operation is specified as a base for profiling in specific OWS specifications. For information on the allowed changes and limitations in such profiling, see Subclause 9.4.1 of the OWS Common specification.
+		
+		OWS is an OGC Standard.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<!-- ==============================================================
+		includes and imports
+	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
+	<include schemaLocation="owsDataIdentification.xsd"></include>
+	<include schemaLocation="owsGetCapabilities.xsd"></include>
+	<!-- ==============================================================
+		elements and types
+	============================================================== -->
+	<element name="Resource">
+		<annotation>
+			<documentation>XML encoded GetResourceByID operation response. The complexType used by this element shall be specified by each specific OWS.  </documentation>
+		</annotation>
+	</element>
+	<!-- =========================================================== -->
+	<element name="GetResourceByID" type="ows:GetResourceByIdType"></element>
+	<!-- =========================================================== -->
+	<complexType name="GetResourceByIdType">
+		<annotation>
+			<documentation>Request to a service to perform the GetResourceByID operation. This operation allows a client to retrieve one or more identified resources, including datasets and resources that describe datasets or parameters. In this XML encoding, no "request" parameter is included, since the element name specifies the specific operation. </documentation>
+		</annotation>
+		<sequence>
+			<element name="ResourceID" type="anyURI" minOccurs="0" maxOccurs="unbounded">
+				<annotation>
+					<documentation>Unordered list of zero or more resource identifiers. These identifiers can be listed in the Contents section of the service metadata (Capabilities) document. For more information on this parameter, see Subclause 9.4.2.1 of the OWS Common specification. </documentation>
+				</annotation>
+			</element>
+			<element ref="ows:OutputFormat" minOccurs="0">
+				<annotation>
+					<documentation>Optional reference to the data format to be used for response to this operation request. This element shall be included when multiple output formats are available for the selected resource(s), and the client desires a format other than the specified default, if any. </documentation>
+				</annotation>
+			</element>
+		</sequence>
+		<attribute name="service" type="ows:ServiceType" use="required"></attribute>
+		<attribute name="version" type="ows:VersionType" use="required"></attribute>
+	</complexType>
+	<!-- =========================================================== -->
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/1.1.0/owsInputOutputData.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsInputOutputData.xsd
new file mode 100644
index 0000000..7bdd52b
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsInputOutputData.xsd
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
+xmlns="http://www.w3.org/2001/XMLSchema" 
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
+	<annotation>
+		<appinfo>owsInputOutputData.xsd</appinfo>
+		<documentation>This XML Schema Document specifies types and elements for input and output of operation data, allowing including multiple data items with each data item either included or referenced. The contents of each type and element specified here can be restricted and/or extended for each use in a specific OWS specification.
+		
+		OWS is an OGC Standard.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<!-- ==============================================================
+		includes and imports
+	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
+	<include schemaLocation="owsManifest.xsd"/>
+	<!-- ==========================================================
+		Types and elements
+	    ========================================================== -->
+	<element name="OperationResponse" type="ows:ManifestType">
+		<annotation>
+			<documentation>Response from an OWS operation, allowing including multiple output data items with each item either included or referenced. This OperationResponse element, or an element using the ManifestType with a more specific element name, shall be used whenever applicable for responses from OWS operations. </documentation>
+			<documentation>This element is specified for use where the ManifestType contents are needed for an operation response, but the Manifest element name is not fully applicable. This element or the ManifestType shall be used instead of using the ows:ReferenceType proposed in OGC 04-105. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="InputData" type="ows:ManifestType">
+		<annotation>
+			<documentation>Input data in a XML-encoded OWS operation request, allowing including multiple data items with each data item either included or referenced. This InputData element, or an element using the ManifestType with a more-specific element name (TBR), shall be used whenever applicable within XML-encoded OWS operation requests. </documentation>
+		</annotation>
+	</element>
+	<!-- ========================================================== -->
+	<element name="ServiceReference" type="ows:ServiceReferenceType" substitutionGroup="ows:Reference"/>
+	<!-- ========================================================== -->
+	<complexType name="ServiceReferenceType">
+		<annotation>
+			<documentation>Complete reference to a remote resource that needs to be retrieved from an OWS using an XML-encoded operation request. This element shall be used, within an InputData or Manifest element that is used for input data, when that input data needs to be retrieved from another web service using a XML-encoded OWS operation request. This element shall not be used for local payload input data or for requesting the resource from a web server using HTTP Get. </documentation>
+		</annotation>
+		<complexContent>
+			<extension base="ows:ReferenceType">
+				<choice>
+					<element name="RequestMessage" type="anyType">
+						<annotation>
+							<documentation>The XML-encoded operation request message to be sent to request this input data from another web server using HTTP Post. </documentation>
+						</annotation>
+					</element>
+					<element name="RequestMessageReference" type="anyURI">
+						<annotation>
+							<documentation>Reference to the XML-encoded operation request message to be sent to request this input data from another web server using HTTP Post. The referenced message shall be attached to the same message (using the cid scheme), or be accessible using a URL. </documentation>
+						</annotation>
+					</element>
+				</choice>
+			</extension>
+		</complexContent>
+	</complexType>
+	<!-- ========================================================== -->
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/1.1.0/owsManifest.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsManifest.xsd
new file mode 100644
index 0000000..15942e6
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsManifest.xsd
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
+xmlns:xlink="http://www.w3.org/1999/xlink" 
+xmlns="http://www.w3.org/2001/XMLSchema" 
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
+	<annotation>
+		<appinfo>owsManifest.xsd</appinfo>
+		<documentation>This XML Schema Document specifies types and elements for document or resource references and for package manifests that contain multiple references. The contents of each type and element specified here can be restricted and/or extended for each use in a specific OWS specification.
+		
+		OWS is an OGC Standard.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
+		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+		</documentation>
+	</annotation>
+	<!-- ==============================================================
+		includes and imports
+	============================================================== -->
+	<include schemaLocation="owsDataIdentification.xsd"/>
+	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="../../../w3c/1999/xlink.xsd"/>
+	<!-- ==========================================================
+		Types and elements
+	    ========================================================== -->
+	<element name="AbstractReferenceBase" type="ows:AbstractReferenceBaseType" abstract="true"/>
+	<!-- ========================================================== -->
+	<complexType name="AbstractReferenceBaseType">
+		<annotation>
+			<documentation> Base for a reference to a remote or local resource. </documentation>
+			<documentation>This type contains only a restricted and annotated set of the attributes from the xlink:simpleAttrs attributeGroup. </documentation>
+		</annotation>
+		<attribute name="type" type="string" fixed="simple" form="qualified"/>
+		<attribute ref="xlink:href" use="required">
+				<annotation>
+					<documentation>Reference to a remote resource or local payload. A remote resource is typically addressed by a URL. For a local payload (such as a multipart mime message), the xlink:href must start with the prefix cid:. </documentation>
+			</annotation>
+		</attribute>
+		<attribute ref="xlink:role" use="optional">
+			<annotation>
+				<documentation>Reference to a resource that describes the role of this reference. When no value is supplied, no particular role value is to be inferred. </documentation>
+			</annotation>
+		</attribute>
+		<attribute ref="xlink:arcrole" use="optional">
+			<annotation>
+				<documentation>Although allowed, this attribute is not expected to be useful in this application of xlink:simpleAttrs. </documentation>
+			</annotation>
+		</attribute>
+		<attribute ref="xlink:title" use="optional">
+			<annotation>
+				<documentation>Describes the meaning of the referenced resource in a human-readable fashion. </documentation>
+			</annotation>
+		</attribute>
+		<attribute ref="xlink:show" use="optional">
+			<annotation>
+				<documentation>Although allowed, this attribute is not expected to be useful in this application of xlink:simpleAttrs. </documentation>
+			</annotation>
+		</attribute>
+		<attribute ref="xlink:actuate" use="optional">
+			<annotation>
+				<documentation>Although allowed, this attribute is not expected to be useful in this application of xlink:simpleAttrs. </documentation>
+			</annotation>
+		</attribute>
+	</complexType>
+	<!-- ========================================================== -->
+	<element name="Reference" type="ows:ReferenceType" substitutionGroup="ows:AbstractReferenceBase"/>
+	<!-- ========================================================== -->
+	<complexType name="ReferenceType">
+		<annotation>
+			<documentation>Complete reference to a remote or local resource, allowing including metadata about that resource. </documentation>
+		</annotation>
+		<complexContent>
+			<extension base="ows:AbstractReferenceBaseType">
+				<sequence>
+					<element ref="ows:Identifier" minOccurs="0">
+						<annotation>
+							<documentation>Optional unique identifier of the referenced resource. </documentation>
+						</annotation>
+					</element>
+					<element ref="ows:Abstract" minOccurs="0" maxOccurs="unbounded"/>
+					<element name="Format" type="ows:MimeType" minOccurs="0">
+						<annotation>
+							<documentation>The format of the referenced resource. This element is omitted when the mime type is indicated in the http header of the reference. </documentation>
+						</annotation>
+					</element>
+					<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
+						<annotation>
+							<documentation>Optional unordered list of additional metadata about this resource. A list of optional metadata elements for this ReferenceType could be specified in the Implementation Specification for each use of this type in a specific OWS. </documentation>
+						</annotation>
+					</element>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<!-- =========================================================== -->
+	<!-- =========================================================== -->
+	<element name="ReferenceGroup" type="ows:ReferenceGroupType"/>
+	<!-- =========================================================== -->
+	<complexType name="ReferenceGroupType">
+		<annotation>
+			<documentation>Logical group of one or more references to remote and/or local resources, allowing including metadata about that group. A Group can be used instead of a Manifest that can only contain one group. </documentation>
+		</annotation>
+		<complexContent>
+			<extension base="ows:BasicIdentificationType">
+				<sequence>
+					<element ref="ows:AbstractReferenceBase" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<!-- =========================================================== -->
+	<element name="Manifest" type="ows:ManifestType"/>
+	<!-- =========================================================== -->
+	<complexType name="ManifestType">
+		<annotation>
+			<documentation>Unordered list of one or more groups of references to remote and/or local resources. </documentation>
+		</annotation>
+		<complexContent>
+			<extension base="ows:BasicIdentificationType">
+				<sequence>
+					<element ref="ows:ReferenceGroup" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<!-- ========================================================== -->
+</schema>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsOperationsMetadata.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsOperationsMetadata.xsd
similarity index 79%
rename from pycsw/schemas/ogc/ows/1.0.0/owsOperationsMetadata.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsOperationsMetadata.xsd
index b7dcc88..4861a90 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsOperationsMetadata.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsOperationsMetadata.xsd
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>owsOperationsMetadata.xsd 2010-01-30</appinfo>
+		<appinfo>owsOperationsMetadata.xsd</appinfo>
 		<documentation>This XML Schema Document encodes the basic contents of the "OperationsMetadata" section of the GetCapabilities operation response, also known as the Capabilities XML document.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+			
+			OWS is an OGC Standard.
+			Copyright (c) 2006,2010 Open Geospatial Consortium.
+			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
 	<include schemaLocation="owsCommon.xsd"/>
 	<include schemaLocation="ows19115subset.xsd"/>
+	<include schemaLocation="owsDomainType.xsd"/>
 	<!-- ==============================================================
 		elements and types
 	============================================================== -->
@@ -136,26 +138,4 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 		</complexContent>
 	</complexType>
 	<!-- ========================================================== -->
-	<complexType name="DomainType">
-		<annotation>
-			<documentation>Valid domain (or set of values) of one parameter or other quantity used by this server. A non-parameter quantity may not be explicitly represented in the server software. (Informative: An example is the outputFormat parameter of a WFS. Each WFS server should provide a Parameter element for the outputFormat parameter that lists the supported output formats, such as GML2, GML3, etc. as the allowed "Value" elements.) </documentation>
-		</annotation>
-		<sequence>
-			<element name="Value" type="string" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Unordered list of all the valid values for this parameter or other quantity. For those parameters that contain a list or sequence of values, these values shall be for individual values in the list. The allowed set of values and the allowed server restrictions on that set of values shall be specified in the Implementation Specification for this service. </documentation>
-				</annotation>
-			</element>
-			<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Optional unordered list of additional metadata about this parameter. A list of required and optional metadata elements for this domain should be specified in the Implementation Specification for this service. (Informative: This metadata might specify the meanings of the valid values.) </documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attribute name="name" type="string" use="required">
-			<annotation>
-				<documentation>Name or identifier of this parameter or other quantity. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
 </schema>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsServiceIdentification.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsServiceIdentification.xsd
similarity index 74%
rename from pycsw/schemas/ogc/ows/1.0.0/owsServiceIdentification.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsServiceIdentification.xsd
index 9c91c81..c15fcfa 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsServiceIdentification.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsServiceIdentification.xsd
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>owsServiceIdentification.xsd 2010-01-30</appinfo>
-		<documentation>This XML Schema Document encodes the common "ServiceIdentification" section of the GetCapabilities operation response, known as the Capabilities XML document. This section encodes the SV_ServiceIdentification class of ISO 19119 (OGC Abstract Specification Topic 12).
+		<appinfo>owsServiceIdentification.xsd</appinfo>
+		<documentation>This XML Schema Document encodes the common "ServiceIdentification" section of the GetCapabilities operation response, known as the Capabilities XML document. This section encodes the SV_ServiceIdentification class of ISO 19119 (OGC Abstract Specification Topic 12). 
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
 	<include schemaLocation="owsDataIdentification.xsd"/>
 	<!-- ==============================================================
 		elements and types
@@ -37,6 +38,11 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 								<documentation>Unordered list of one or more versions of this service type implemented by this server. This information is not adequate for version negotiation, and shall not be used for that purpose. </documentation>
 							</annotation>
 						</element>
+						<element name="Profile" type="anyURI" minOccurs="0" maxOccurs="unbounded">
+							<annotation>
+								<documentation>Unordered list of identifiers of Application Profiles that are implemented by this server. This element should be included for each specified application profile implemented by this server. The identifier value should be specified by each Application Profile. If this element is omitted, no meaning is implied. </documentation>
+							</annotation>
+						</element>
 						<element ref="ows:Fees" minOccurs="0">
 							<annotation>
 								<documentation>If this element is omitted, no meaning is implied. </documentation>
@@ -44,7 +50,7 @@ elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
 						</element>
 						<element ref="ows:AccessConstraints" minOccurs="0" maxOccurs="unbounded">
 							<annotation>
-								<documentation>Unordered list of access constraints applied to assure the protection of privacy or intellectual property, and any other restrictions on retrieving or using data from or otherwise using this server. The reserved value NONE (case insensitive) shall be used to mean no access constraints are imposed. If this element is omitted, no meaning is implied. </documentation>
+								<documentation>Unordered list of access constraints applied to assure the protection of privacy or intellectual property, and any other restrictions on retrieving or using data from or otherwise using this server. The reserved value NONE (case insensitive) shall be used to mean no access constraints are imposed. When this element is omitted, no meaning is implied. </documentation>
 							</annotation>
 						</element>
 					</sequence>
diff --git a/pycsw/schemas/ogc/ows/1.0.0/owsServiceProvider.xsd b/pycsw/core/schemas/ogc/ows/1.1.0/owsServiceProvider.xsd
similarity index 83%
rename from pycsw/schemas/ogc/ows/1.0.0/owsServiceProvider.xsd
rename to pycsw/core/schemas/ogc/ows/1.1.0/owsServiceProvider.xsd
index 17c3dba..bce3e64 100644
--- a/pycsw/schemas/ogc/ows/1.0.0/owsServiceProvider.xsd
+++ b/pycsw/core/schemas/ogc/ows/1.1.0/owsServiceProvider.xsd
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows" 
-xmlns:ows="http://www.opengis.net/ows" 
+<schema targetNamespace="http://www.opengis.net/ows/1.1" 
+xmlns:ows="http://www.opengis.net/ows/1.1" 
+xmlns:xlink="http://www.w3.org/1999/xlink" 
 xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.0.0 2010-01-30" xml:lang="en">
+elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
 	<annotation>
-		<appinfo>owsServiceProvider.xsd 2010-01-30</appinfo>
-		<documentation>This XML Schema Document encodes the common "ServiceProvider" section of the GetCapabilities operation response, known as the Capabilities XML document. This section encodes the SV_ServiceProvider class of ISO 19119 (OGC Abstract Specification Topic 12).
+		<appinfo>owsServiceProvider.xsd</appinfo>
+		<documentation>This XML Schema Document encodes the common "ServiceProvider" section of the GetCapabilities operation response, known as the Capabilities XML document. This section encodes the SV_ServiceProvider class of ISO 19119 (OGC Abstract Specification Topic 12). 
 		
 		OWS is an OGC Standard.
-		Copyright (c) 2005,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
+		Copyright (c) 2006,2010 Open Geospatial Consortium.
 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
 		</documentation>
 	</annotation>
 	<!-- ==============================================================
 		includes and imports
 	============================================================== -->
+	<include schemaLocation="owsAll.xsd"/>
 	<include schemaLocation="ows19115subset.xsd"/>
 	<!-- ==============================================================
 		elements and types
diff --git a/pycsw/core/schemas/ogc/ows/2.0/ows19115subset.xsd b/pycsw/core/schemas/ogc/ows/2.0/ows19115subset.xsd
new file mode 100644
index 0000000..b4506ad
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/ows19115subset.xsd
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/2.0"
+        xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>ows19115subset.xsd</appinfo>
+    <documentation>This XML Schema Document encodes the parts of ISO 19115 used
+    by the common "ServiceIdentification" and "ServiceProvider" sections of the
+    GetCapabilities operation response, known as the service metadata XML
+    document. The parts encoded here are the MD_Keywords, CI_ResponsibleParty,
+    and related classes. The UML package prefixes were omitted from XML names,
+    and the XML element names were all capitalized, for consistency with other
+    OWS Schemas. This document also provides a simple coding of text in
+    multiple languages, simplified from Annex J of ISO 19115.
+		
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+    </documentation>
+  </annotation>
+  
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <import namespace="http://www.w3.org/1999/xlink"
+          schemaLocation="../../../w3c/1999/xlink.xsd" />
+  <import namespace="http://www.w3.org/XML/1998/namespace"
+          schemaLocation="../../../w3c/2001/xml.xsd" />
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <complexType name="LanguageStringType">
+    <annotation>
+      <documentation>Text string with the language of the string identified as
+      recommended in the XML 1.0 W3C Recommendation, section
+      2.12.</documentation>
+    </annotation>
+    <simpleContent>
+      <extension base="string">
+        <attribute ref="xml:lang"
+                   use="optional" />
+      </extension>
+    </simpleContent>
+  </complexType>
+  <!-- =========================================================== -->
+  <element name="Title"
+           type="ows:LanguageStringType">
+    <annotation>
+      <documentation>Title of this resource, normally used for display to
+      humans.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <element name="Abstract"
+           type="ows:LanguageStringType">
+    <annotation>
+      <documentation>Brief narrative description of this resource, normally
+      used for display to humans.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <element name="Keywords"
+           type="ows:KeywordsType" />
+  <!-- =========================================================== -->
+  <complexType name="KeywordsType">
+    <annotation>
+      <documentation>Unordered list of one or more commonly used or formalised
+      word(s) or phrase(s) used to describe the subject. When needed, the
+      optional "type" can name the type of the associated list of keywords
+      that shall all have the same type. Also when needed, the codeSpace
+      attribute of that "type" can reference the type name authority and/or
+      thesaurus. If the xml:lang attribute is not included in a Keyword
+      element, then no language is specified for that element unless specified
+      by another means. All Keyword elements in the same Keywords element that
+      share the same xml:lang attribute value represent different keywords in
+      that language.</documentation>
+      <documentation>For OWS use, the optional thesaurusName element was
+      omitted as being complex information that could be referenced by the
+      codeSpace attribute of the Type element.</documentation>
+    </annotation>
+    <sequence>
+      <element name="Keyword"
+               type="ows:LanguageStringType"
+               maxOccurs="unbounded" />
+      <element name="Type"
+               type="ows:CodeType"
+               minOccurs="0" />
+    </sequence>
+  </complexType>
+  <!-- =========================================================== -->
+  <complexType name="CodeType">
+    <annotation>
+      <documentation>Name or code with an (optional) authority. If the
+      codeSpace attribute is present, its value shall reference a dictionary,
+      thesaurus, or authority for the name or code, such as the organisation
+      who assigned the value, or the dictionary from which it is
+      taken.</documentation>
+      <documentation>Type copied from basicTypes.xsd of GML 3 with
+      documentation edited, for possible use outside the ServiceIdentification
+      section of a service metadata document.</documentation>
+    </annotation>
+    <simpleContent>
+      <extension base="string">
+        <attribute name="codeSpace"
+                   type="anyURI"
+                   use="optional" />
+      </extension>
+    </simpleContent>
+  </complexType>
+  <!-- =========================================================== -->
+  <element name="PointOfContact"
+           type="ows:ResponsiblePartyType">
+    <annotation>
+      <documentation>Identification of, and means of communication with,
+      person(s) responsible for the resource(s).</documentation>
+      <documentation>For OWS use in the ServiceProvider section of a service
+      metadata document, the optional organizationName element was removed,
+      since this type is always used with the ProviderName element which
+      provides that information. The optional individualName element was made
+      mandatory, since either the organizationName or individualName element
+      is mandatory. The mandatory "role" element was changed to optional,
+      since no clear use of this information is known in the ServiceProvider
+      section.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <complexType name="ResponsiblePartyType">
+    <annotation>
+      <documentation>Identification of, and means of communication with,
+      person responsible for the server. At least one of IndividualName,
+      OrganisationName, or PositionName shall be included.</documentation>
+    </annotation>
+    <sequence>
+      <element ref="ows:IndividualName"
+               minOccurs="0" />
+      <element ref="ows:OrganisationName"
+               minOccurs="0" />
+      <element ref="ows:PositionName"
+               minOccurs="0" />
+      <element ref="ows:ContactInfo"
+               minOccurs="0" />
+      <element ref="ows:Role" />
+    </sequence>
+  </complexType>
+  <!-- =========================================================== -->
+  <!-- =========================================================== -->
+  <complexType name="ResponsiblePartySubsetType">
+    <annotation>
+      <documentation>Identification of, and means of communication with,
+      person responsible for the server.</documentation>
+      <documentation>For OWS use in the ServiceProvider section of a service
+      metadata document, the optional organizationName element was removed,
+      since this type is always used with the ProviderName element which
+      provides that information. The mandatory "role" element was changed to
+      optional, since no clear use of this information is known in the
+      ServiceProvider section.</documentation>
+    </annotation>
+    <sequence>
+      <element ref="ows:IndividualName"
+               minOccurs="0" />
+      <element ref="ows:PositionName"
+               minOccurs="0" />
+      <element ref="ows:ContactInfo"
+               minOccurs="0" />
+      <element ref="ows:Role"
+               minOccurs="0" />
+    </sequence>
+  </complexType>
+  <!-- =========================================================== -->
+  <element name="IndividualName"
+           type="string">
+    <annotation>
+      <documentation>Name of the responsible person: surname, given name,
+      title separated by a delimiter.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <element name="OrganisationName"
+           type="string">
+    <annotation>
+      <documentation>Name of the responsible organization.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <element name="PositionName"
+           type="string">
+    <annotation>
+      <documentation>Role or position of the responsible
+      person.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <element name="Role"
+           type="ows:CodeType">
+    <annotation>
+      <documentation>Function performed by the responsible party. Possible
+      values of this Role shall include the values and the meanings listed in
+      Subclause B.5.5 of ISO 19115:2003.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <element name="ContactInfo"
+           type="ows:ContactType">
+    <annotation>
+      <documentation>Address of the responsible party.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <complexType name="ContactType">
+    <annotation>
+      <documentation>Information required to enable contact with the
+      responsible person and/or organization.</documentation>
+      <documentation>For OWS use in the service metadata document, the
+      optional hoursOfService and contactInstructions elements were retained,
+      as possibly being useful in the ServiceProvider section.</documentation>
+    </annotation>
+    <sequence>
+      <element name="Phone"
+               type="ows:TelephoneType"
+               minOccurs="0">
+        <annotation>
+          <documentation>Telephone numbers at which the organization or
+          individual may be contacted.</documentation>
+        </annotation>
+      </element>
+      <element name="Address"
+               type="ows:AddressType"
+               minOccurs="0">
+        <annotation>
+          <documentation>Physical and email address at which the organization
+          or individual may be contacted.</documentation>
+        </annotation>
+      </element>
+      <element name="OnlineResource"
+               type="ows:OnlineResourceType"
+               minOccurs="0">
+        <annotation>
+          <documentation>On-line information that can be used to contact the
+          individual or organization. OWS specifics: The xlink:href attribute
+          in the xlink:simpleAttrs attribute group shall be used to reference
+          this resource. Whenever practical, the xlink:href attribute with
+          type anyURI should be a URL from which more contact information can
+          be electronically retrieved. The xlink:title attribute with type
+          "string" can be used to name this set of information. The other
+          attributes in the xlink:simpleAttrs attribute group should not be
+          used.</documentation>
+        </annotation>
+      </element>
+      <element name="HoursOfService"
+               type="string"
+               minOccurs="0">
+        <annotation>
+          <documentation>Time period (including time zone) when individuals
+          can contact the organization or individual.</documentation>
+        </annotation>
+      </element>
+      <element name="ContactInstructions"
+               type="string"
+               minOccurs="0">
+        <annotation>
+          <documentation>Supplemental instructions on how or when to contact
+          the individual or organization.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+  </complexType>
+  <!-- =========================================================== -->
+  <complexType name="OnlineResourceType">
+    <annotation>
+      <documentation>Reference to on-line resource from which data can be
+      obtained.</documentation>
+      <documentation>For OWS use in the service metadata document, the
+      CI_OnlineResource class was XML encoded as the attributeGroup
+      "xlink:simpleAttrs", as used in GML.</documentation>
+    </annotation>
+    <attributeGroup ref="xlink:simpleAttrs" />
+  </complexType>
+  <!-- ========================================================== -->
+  <complexType name="TelephoneType">
+    <annotation>
+      <documentation>Telephone numbers for contacting the responsible
+      individual or organization.</documentation>
+    </annotation>
+    <sequence>
+      <element name="Voice"
+               type="string"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Telephone number by which individuals can speak to
+          the responsible organization or individual.</documentation>
+        </annotation>
+      </element>
+      <element name="Facsimile"
+               type="string"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Telephone number of a facsimile machine for the
+          responsible organization or individual.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+  </complexType>
+  <!-- =========================================================== -->
+  <complexType name="AddressType">
+    <annotation>
+      <documentation>Location of the responsible individual or
+      organization.</documentation>
+    </annotation>
+    <sequence>
+      <element name="DeliveryPoint"
+               type="string"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Address line for the location.</documentation>
+        </annotation>
+      </element>
+      <element name="City"
+               type="string"
+               minOccurs="0">
+        <annotation>
+          <documentation>City of the location.</documentation>
+        </annotation>
+      </element>
+      <element name="AdministrativeArea"
+               type="string"
+               minOccurs="0">
+        <annotation>
+          <documentation>State or province of the location.</documentation>
+        </annotation>
+      </element>
+      <element name="PostalCode"
+               type="string"
+               minOccurs="0">
+        <annotation>
+          <documentation>ZIP or other postal code.</documentation>
+        </annotation>
+      </element>
+      <element name="Country"
+               type="string"
+               minOccurs="0">
+        <annotation>
+          <documentation>Country of the physical address.</documentation>
+        </annotation>
+      </element>
+      <element name="ElectronicMailAddress"
+               type="string"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Address of the electronic mailbox of the responsible
+          organization or individual.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+  </complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsAdditionalParameters.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsAdditionalParameters.xsd
new file mode 100644
index 0000000..8e91265
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsAdditionalParameters.xsd
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/2.0"
+        xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsAdditionalParameters.xsd</appinfo>
+    <documentation>This XML Schema Document encodes a new AdditionalParameters
+    element that contains one or more AdditionalParameter elements, which each
+    contain a specific parameter name and one or more values of that parameter.
+    This AdditionalParameters element is substitutable for ows:Metadata,
+    anywhere that element is allowed. The document also encodes a new nilValue
+    element of a newly defined NilValue type that allows the specification of
+    a nilReason attribute.
+
+   OWS is an OGC Standard.
+   Copyright (c) 2009 Open Geospatial Consortium.
+   To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+    </documentation>
+  </annotation>
+
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <include schemaLocation="owsCommon.xsd" />
+  <include schemaLocation="ows19115subset.xsd" />
+  <include schemaLocation="owsDomainType.xsd" />
+  
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <element name="AdditionalParameters"
+           type="ows:AdditionalParametersType"
+           substitutionGroup="ows:Metadata">
+    <annotation>
+      <documentation>Unordered list of one or more
+      AdditionalParameters.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <complexType name="AdditionalParametersBaseType">
+    <complexContent>
+      <restriction base="ows:MetadataType">
+        <sequence>
+          <element ref="ows:AdditionalParameter" />
+        </sequence>
+      </restriction>
+    </complexContent>
+  </complexType>
+  <!-- ========================================================== -->
+  <complexType name="AdditionalParametersType">
+    <complexContent>
+      <extension base="ows:AdditionalParametersBaseType">
+        <sequence>
+          <element ref="ows:AdditionalParameter"
+                   minOccurs="0"
+                   maxOccurs="unbounded" />
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <!-- ========================================================== -->
+  <element name="AdditionalParameter"
+           substitutionGroup="ows:AbstractMetaData">
+    <annotation>
+      <documentation>One additional metadata parameter.</documentation>
+    </annotation>
+    <complexType>
+      <sequence>
+        <element name="Name"
+                 type="ows:CodeType">
+          <annotation>
+            <documentation>Name or identifier of this AdditionalParameter,
+            unique for this OGC Web Service.</documentation>
+          </annotation>
+        </element>
+        <element name="Value"
+                 type="anyType"
+                 maxOccurs="unbounded">
+          <annotation>
+            <documentation>Unordered list of one or more values of this
+            AdditionalParameter.</documentation>
+          </annotation>
+        </element>
+      </sequence>
+    </complexType>
+  </element>
+  <!-- ========================================================== -->
+  <element name="nilValue"
+           type="ows:NilValueType" />
+  <!-- ========================================================== -->
+  <complexType name="NilValueType">
+    <annotation>
+      <documentation>The value used (e.g. -255) to represent a nil value with
+      optional nilReason and codeSpace attributes.</documentation>
+    </annotation>
+    <simpleContent>
+      <extension base="ows:CodeType">
+        <attribute name="nilReason"
+                   type="anyURI"
+                   use="optional">
+          <annotation>
+            <documentation>An anyURI value which refers to a resource that
+            describes the reason for the nil value</documentation>
+          </annotation>
+        </attribute>
+      </extension>
+    </simpleContent>
+  </complexType>
+  <!-- ========================================================== -->
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsAll.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsAll.xsd
new file mode 100644
index 0000000..8063899
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsAll.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/2.0"
+        xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsAll.xsd</appinfo>
+    <documentation>This XML Schema Document includes and imports, directly or
+      indirectly, all the XML Schemas defined by the OWS Common Implemetation
+      Specification.
+      
+      OWS is an OGC Standard.
+      Copyright (c) 2009 Open Geospatial Consortium.
+      To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+    </documentation>
+  </annotation>
+
+  <!-- ==============================================================
+		includes and imports
+	============================================================== -->
+  <include schemaLocation="owsGetResourceByID.xsd"/>
+  <include schemaLocation="owsExceptionReport.xsd"/>
+  <include schemaLocation="owsDomainType.xsd"/>
+  <include schemaLocation="owsContents.xsd"/>
+  <include schemaLocation="owsInputOutputData.xsd"/>
+  <include schemaLocation="owsAdditionalParameters.xsd"/>
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsCommon.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsCommon.xsd
new file mode 100644
index 0000000..4c24e2e
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsCommon.xsd
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/2.0"
+        xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsCommon.xsd</appinfo>
+    <documentation>This XML Schema Document encodes various parameters and
+    parameter types that can be used in OWS operation requests and responses.
+    
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/
+    </documentation>
+  </annotation>
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <import namespace="http://www.w3.org/1999/xlink"
+          schemaLocation="../../../w3c/1999/xlink.xsd" />
+
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <simpleType name="MimeType">
+    <annotation>
+      <documentation>XML encoded identifier of a standard MIME type, possibly
+      a parameterized MIME type.</documentation>
+    </annotation>
+    <restriction base="string">
+      <pattern value="(application|audio|image|text|video|message|multipart|model)/.+(;\s*.+=.+)*" />
+    </restriction>
+  </simpleType>
+  <!-- ========================================================= -->
+  <simpleType name="VersionType">
+    <annotation>
+      <documentation>Specification version for OWS operation. The string value
+      shall contain one x.y.z "version" value (e.g., "2.1.3"). A version
+      number shall contain three non-negative integers separated by decimal
+      points, in the form "x.y.z". The integers y and z shall not exceed 99.
+      Each version shall be for the Implementation Specification (document)
+      and the associated XML Schemas to which requested operations will
+      conform. An Implementation Specification version normally specifies XML
+      Schemas against which an XML encoded operation response must conform and
+      should be validated. See Version negotiation subclause for more
+      information.</documentation>
+    </annotation>
+    <restriction base="string">
+      <pattern value="\d+\.\d?\d\.\d?\d" />
+    </restriction>
+  </simpleType>
+  <!-- ========================================================== -->
+  <element name="Metadata"
+           type="ows:MetadataType" />
+  <!-- ========================================================== -->
+  <complexType name="MetadataType">
+    <annotation>
+      <documentation>This element either references or contains more metadata
+      about the element that includes this element. To reference metadata
+      stored remotely, at least the xlinks:href attribute in xlink:simpleAttrs
+      shall be included. Either at least one of the attributes in
+      xlink:simpleAttrs or a substitute for the AbstractMetaData element shall
+      be included, but not both. An Implementation Specification can restrict
+      the contents of this element to always be a reference or always contain
+      metadata. (Informative: This element was adapted from the
+      metaDataProperty element in GML 3.0.)</documentation>
+    </annotation>
+    <sequence>
+      <element ref="ows:AbstractMetaData"
+               minOccurs="0" />
+    </sequence>
+    <attributeGroup ref="xlink:simpleAttrs">
+      <annotation>
+        <documentation>Reference to metadata recorded elsewhere, either
+        external to this XML document or within it. Whenever practical, the
+        xlink:href attribute with type anyURI should include a URL from which
+        this metadata can be electronically retrieved.</documentation>
+      </annotation>
+    </attributeGroup>
+    <attribute name="about"
+               type="anyURI"
+               use="optional">
+      <annotation>
+        <documentation>Optional reference to the aspect of the element which
+        includes this "metadata" element that this metadata provides more
+        information about.</documentation>
+      </annotation>
+    </attribute>
+  </complexType>
+  <!-- ========================================================== -->
+  <element name="AbstractMetaData"
+           abstract="true">
+    <annotation>
+      <documentation>Abstract element containing more metadata about the
+      element that includes the containing "metadata" element. A specific
+      server implementation, or an Implementation Specification, can define
+      concrete elements in the AbstractMetaData substitution
+      group.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <!-- ========================================================== -->
+  <element name="BoundingBox"
+           type="ows:BoundingBoxType" />
+  <!-- =========================================================== -->
+  <complexType name="BoundingBoxType">
+    <annotation>
+      <documentation>XML encoded minimum rectangular bounding box (or region)
+      parameter, surrounding all the associated data.</documentation>
+      <documentation>This type is adapted from the EnvelopeType of GML 3.1,
+      with modified contents and documentation for encoding a MINIMUM size box
+      SURROUNDING all associated data.</documentation>
+    </annotation>
+    <sequence>
+      <element name="LowerCorner"
+               type="ows:PositionType">
+        <annotation>
+          <documentation>Position of the bounding box corner at which the
+          value of each coordinate normally is the algebraic minimum within
+          this bounding box. In some cases, this position is normally
+          displayed at the top, such as the top left for some image
+          coordinates. For more information, see Subclauses 10.2.5 and
+          C.13.</documentation>
+        </annotation>
+      </element>
+      <element name="UpperCorner"
+               type="ows:PositionType">
+        <annotation>
+          <documentation>Position of the bounding box corner at which the
+          value of each coordinate normally is the algebraic maximum within
+          this bounding box. In some cases, this position is normally
+          displayed at the bottom, such as the bottom right for some image
+          coordinates. For more information, see Subclauses 10.2.5 and
+          C.13.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+    <attribute name="crs"
+               type="anyURI"
+               use="optional">
+      <annotation>
+        <documentation>Usually references the definition of a CRS, as
+        specified in [OGC Topic 2]. Such a CRS definition can be XML encoded
+        using the gml:CoordinateReferenceSystemType in [GML 3.1]. For well
+        known references, it is not required that a CRS definition exist at
+        the location the URI points to. If no anyURI value is included, the
+        applicable CRS must be either: a) Specified outside the bounding box,
+        but inside a data structure that includes this bounding box, as
+        specified for a specific OWS use of this bounding box type. b) Fixed
+        and specified in the Implementation Specification for a specific OWS
+        use of the bounding box type.</documentation>
+      </annotation>
+    </attribute>
+    <attribute name="dimensions"
+               type="positiveInteger"
+               use="optional">
+      <annotation>
+        <documentation>The number of dimensions in this CRS (the length of a
+        coordinate sequence in this use of the PositionType). This number is
+        specified by the CRS definition, but can also be specified
+        here.</documentation>
+      </annotation>
+    </attribute>
+  </complexType>
+  <!-- =========================================================== -->
+  <simpleType name="PositionType">
+    <annotation>
+      <documentation>Position instances hold the coordinates of a position in
+      a coordinate reference system (CRS) referenced by the related "crs"
+      attribute or elsewhere. For an angular coordinate axis that is
+      physically continuous for multiple revolutions, but whose recorded
+      values can be discontinuous, special conditions apply when the bounding
+      box is continuous across the value discontinuity: a) If the bounding box
+      is continuous clear around this angular axis, then ordinate values of
+      minus and plus infinity shall be used. b) If the bounding box is
+      continuous across the value discontinuity but is not continuous clear
+      around this angular axis, then some non-normal value can be used if
+      specified for a specific OWS use of the BoundingBoxType. For more
+      information, see Subclauses 10.2.5 and C.13.</documentation>
+      <documentation>This type is adapted from DirectPositionType and
+      doubleList of GML 3.1. The adaptations include omission of all the
+      attributes, since the needed information is included in the
+      BoundingBoxType.</documentation>
+    </annotation>
+    <list itemType="double" />
+  </simpleType>
+  <!-- =========================================================== -->
+  <element name="WGS84BoundingBox"
+           type="ows:WGS84BoundingBoxType"
+           substitutionGroup="ows:BoundingBox" />
+  <!-- =========================================================== -->
+  <complexType name="WGS84BoundingBoxType">
+    <annotation>
+      <documentation>XML encoded minimum rectangular bounding box (or region)
+      parameter, surrounding all the associated data. This box is specialized
+      for use with the 2D WGS 84 coordinate reference system with decimal
+      values of longitude and latitude.</documentation>
+      <documentation>This type is adapted from the general BoundingBoxType,
+      with modified contents and documentation for use with the 2D WGS 84
+      coordinate reference system.</documentation>
+    </annotation>
+    <complexContent>
+      <restriction base="ows:BoundingBoxType">
+        <sequence>
+          <element name="LowerCorner"
+                   type="ows:PositionType2D">
+            <annotation>
+              <documentation>Position of the bounding box corner at which the
+              values of longitude and latitude normally are the algebraic
+              minimums within this bounding box. For more information, see
+              Subclauses 10.4.5 and C.13.</documentation>
+            </annotation>
+          </element>
+          <element name="UpperCorner"
+                   type="ows:PositionType2D">
+            <annotation>
+              <documentation>Position of the bounding box corner at which the
+              values of longitude and latitude normally are the algebraic
+              minimums within this bounding box. For more information, see
+              Subclauses 10.4.5 and C.13.</documentation>
+            </annotation>
+          </element>
+        </sequence>
+        <attribute name="crs"
+                   type="anyURI"
+                   use="optional"
+                   fixed="urn:ogc:def:crs:OGC:2:84">
+          <annotation>
+            <documentation>This attribute can be included when considered
+            useful. When included, this attribute shall reference the 2D WGS
+            84 coordinate reference system with longitude before latitude and
+            decimal values of longitude and latitude.</documentation>
+          </annotation>
+        </attribute>
+        <attribute name="dimensions"
+                   type="positiveInteger"
+                   use="optional"
+                   fixed="2">
+          <annotation>
+            <documentation>The number of dimensions in this CRS (the length of
+            a coordinate sequence in this use of the PositionType). This
+            number is specified by the CRS definition, but can also be
+            specified here.</documentation>
+          </annotation>
+        </attribute>
+      </restriction>
+    </complexContent>
+  </complexType>
+  <!-- =========================================================== -->
+  <simpleType name="PositionType2D">
+    <annotation>
+      <documentation>Two-dimensional position instances hold the longitude and
+      latitude coordinates of a position in the 2D WGS 84 coordinate reference
+      system. The longitude value shall be listed first, followed by the
+      latitude value, both in decimal degrees. Latitude values shall range
+      from -90 to +90 degrees, and longitude values shall normally range from
+      -180 to +180 degrees. For the longitude axis, special conditions apply
+      when the bounding box is continuous across the +/- 180 degrees meridian
+      longitude value discontinuity: a) If the bounding box is continuous
+      clear around the Earth, then longitude values of minus and plus infinity
+      shall be used. b) If the bounding box is continuous across the value
+      discontinuity but is not continuous clear around the Earth, then some
+      non-normal value can be used if specified for a specific OWS use of the
+      WGS84BoundingBoxType. For more information, see Subclauses 10.4.5 and
+      C.13.</documentation>
+    </annotation>
+    <restriction base="ows:PositionType">
+      <length value="2" />
+    </restriction>
+  </simpleType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsContents.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsContents.xsd
new file mode 100644
index 0000000..6719e10
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsContents.xsd
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/2.0"
+        xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsContents.xsd</appinfo>
+    <documentation>This XML Schema Document encodes the typical Contents
+    section of an OWS service metadata (Capabilities) document. This Schema
+    can be built upon to define the Contents section for a specific OWS. If
+    the ContentsBaseType in this XML Schema cannot be restricted and extended
+    to define the Contents section for a specific OWS, all other relevant
+    parts defined in owsContents.xsd shall be used by the "ContentsType" in
+    the wxsContents.xsd prepared for the specific OWS.
+    
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/
+    </documentation>
+  </annotation>
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <include schemaLocation="owsDataIdentification.xsd" />
+  
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <complexType name="ContentsBaseType">
+    <annotation>
+      <documentation>Contents of typical Contents section of an OWS service
+      metadata (Capabilities) document. This type shall be extended and/or
+      restricted if needed for specific OWS use to include the specific
+      metadata needed.</documentation>
+    </annotation>
+    <sequence>
+      <element ref="ows:DatasetDescriptionSummary"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Unordered set of summary descriptions for the
+          datasets available from this OWS server. This set shall be included
+          unless another source is referenced and all this metadata is
+          available from that source.</documentation>
+        </annotation>
+      </element>
+      <element ref="ows:OtherSource"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Unordered set of references to other sources of
+          metadata describing the coverage offerings available from this
+          server.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+  </complexType>
+  <!-- ===========================================================-->
+  <element name="OtherSource"
+           type="ows:MetadataType">
+    <annotation>
+      <documentation>Reference to a source of metadata describing coverage
+      offerings available from this server. This parameter can reference a
+      catalogue server from which dataset metadata is available. This ability
+      is expected to be used by servers with thousands or millions of
+      datasets, for which searching a catalogue is more feasible than fetching
+      a long Capabilities XML document. When no DatasetDescriptionSummaries
+      are included, and one or more catalogue servers are referenced, this set
+      of catalogues shall contain current metadata summaries for all the
+      datasets currently available from this OWS server, with the metadata for
+      each such dataset referencing this OWS server.</documentation>
+    </annotation>
+  </element>
+  <!-- ===========================================================-->
+  <element name="DatasetDescriptionSummary"
+           type="ows:DatasetDescriptionSummaryBaseType" />
+  <!-- ===========================================================-->
+  <complexType name="DatasetDescriptionSummaryBaseType">
+    <annotation>
+      <documentation>Typical dataset metadata in typical Contents section of
+      an OWS service metadata (Capabilities) document. This type shall be
+      extended and/or restricted if needed for specific OWS use, to include
+      the specific Dataset description metadata needed.</documentation>
+    </annotation>
+    <complexContent>
+      <extension base="ows:DescriptionType">
+        <sequence>
+          <element ref="ows:WGS84BoundingBox"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Unordered list of zero or more minimum bounding
+              rectangles surrounding coverage data, using the WGS 84 CRS with
+              decimal degrees and longitude before latitude. If no WGS 84
+              bounding box is recorded for a coverage, any such bounding boxes
+              recorded for a higher level in a hierarchy of datasets shall
+              apply to this coverage. If WGS 84 bounding box(es) are recorded
+              for a coverage, any such bounding boxes recorded for a higher
+              level in a hierarchy of datasets shall be ignored. For each
+              lowest-level coverage in a hierarchy, at least one applicable
+              WGS84BoundingBox shall be either recorded or inherited, to
+              simplify searching for datasets that might overlap a specified
+              region. If multiple WGS 84 bounding boxes are included, this
+              shall be interpreted as the union of the areas of these bounding
+              boxes.</documentation>
+            </annotation>
+          </element>
+          <element name="Identifier"
+                   type="ows:CodeType">
+            <annotation>
+              <documentation>Unambiguous identifier or name of this coverage,
+              unique for this server.</documentation>
+            </annotation>
+          </element>
+          <element ref="ows:BoundingBox"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Unordered list of zero or more minimum bounding
+              rectangles surrounding coverage data, in AvailableCRSs. Zero or
+              more BoundingBoxes are allowed in addition to one or more
+              WGS84BoundingBoxes to allow more precise specification of the
+              Dataset area in AvailableCRSs. These Bounding Boxes shall not
+              use any CRS not listed as an AvailableCRS. However, an
+              AvailableCRS can be listed without a corresponding Bounding Box.
+              If no such bounding box is recorded for a coverage, any such
+              bounding boxes recorded for a higher level in a hierarchy of
+              datasets shall apply to this coverage. If such bounding box(es)
+              are recorded for a coverage, any such bounding boxes recorded
+              for a higher level in a hierarchy of datasets shall be ignored.
+              If multiple bounding boxes are included with the same CRS, this
+              shall be interpreted as the union of the areas of these bounding
+              boxes.</documentation>
+            </annotation>
+          </element>
+          <element ref="ows:Metadata"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Optional unordered list of additional metadata
+              about this dataset. A list of optional metadata elements for
+              this dataset description could be specified in the
+              Implementation Specification for this service.</documentation>
+            </annotation>
+          </element>
+          <element ref="ows:DatasetDescriptionSummary"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Metadata describing zero or more unordered
+              subsidiary datasets available from this server.</documentation>
+            </annotation>
+          </element>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <!-- ===========================================================-->
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsDataIdentification.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsDataIdentification.xsd
new file mode 100644
index 0000000..cb59979
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsDataIdentification.xsd
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="http://www.opengis.net/ows/2.0"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsDataIdentification.xsd</appinfo>
+    <documentation>This XML Schema Document encodes the parts of the
+    MD_DataIdentification class of ISO 19115 (OGC Abstract Specification Topic
+    11) which are expected to be used for most datasets. This Schema also
+    encodes the parts of this class that are expected to be useful for other
+    metadata. Both may be used within the Contents section of OWS service
+    metadata (Capabilities) documents.
+    
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/
+    </documentation>
+  </annotation>
+  
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <include schemaLocation="owsCommon.xsd" />
+  <include schemaLocation="ows19115subset.xsd" />
+  
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <complexType name="DescriptionType">
+    <annotation>
+      <documentation>Human-readable descriptive information for the object it
+      is included within. This type shall be extended if needed for specific
+      OWS use to include additional metadata for each type of information.
+      This type shall not be restricted for a specific OWS to change the
+      multiplicity (or optionality) of some elements. If the xml:lang
+      attribute is not included in a Title, Abstract or Keyword element, then
+      no language is specified for that element unless specified by another
+      means. All Title, Abstract and Keyword elements in the same Description
+      that share the same xml:lang attribute value represent the description
+      of the parent object in that language. Multiple Title or Abstract
+      elements shall not exist in the same Description with the same xml:lang
+      attribute value unless otherwise specified.</documentation>
+    </annotation>
+    <sequence>
+      <element ref="ows:Title"
+               minOccurs="0"
+               maxOccurs="unbounded" />
+      <element ref="ows:Abstract"
+               minOccurs="0"
+               maxOccurs="unbounded" />
+      <element ref="ows:Keywords"
+               minOccurs="0"
+               maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+  <!-- ========================================================= -->
+  <complexType name="BasicIdentificationType">
+    <annotation>
+      <documentation>Basic metadata identifying and describing a set of
+      data.</documentation>
+    </annotation>
+    <complexContent>
+      <extension base="ows:DescriptionType">
+        <sequence>
+          <element ref="ows:Identifier"
+                   minOccurs="0">
+            <annotation>
+              <documentation>Optional unique identifier or name of this
+              dataset.</documentation>
+            </annotation>
+          </element>
+          <element ref="ows:Metadata"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Optional unordered list of additional metadata
+              about this data(set). A list of optional metadata elements for
+              this data identification could be specified in the
+              Implementation Specification for this service.</documentation>
+            </annotation>
+          </element>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <!-- ========================================================= -->
+  <complexType name="IdentificationType">
+    <annotation>
+      <documentation>Extended metadata identifying and describing a set of
+      data. This type shall be extended if needed for each specific OWS to
+      include additional metadata for each type of dataset. If needed, this
+      type should first be restricted for each specific OWS to change the
+      multiplicity (or optionality) of some elements.</documentation>
+    </annotation>
+    <complexContent>
+      <extension base="ows:BasicIdentificationType">
+        <sequence>
+          <element ref="ows:BoundingBox"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Unordered list of zero or more bounding boxes
+              whose union describes the extent of this
+              dataset.</documentation>
+            </annotation>
+          </element>
+          <element ref="ows:OutputFormat"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Unordered list of zero or more references to data
+              formats supported for server outputs.</documentation>
+            </annotation>
+          </element>
+          <element ref="ows:AvailableCRS"
+                   minOccurs="0"
+                   maxOccurs="unbounded">
+            <annotation>
+              <documentation>Unordered list of zero or more available
+              coordinate reference systems.</documentation>
+            </annotation>
+          </element>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <!-- ===========================================================-->
+  <element name="Identifier"
+           type="ows:CodeType">
+    <annotation>
+      <documentation>Unique identifier or name of this
+      dataset.</documentation>
+    </annotation>
+  </element>
+  <!-- ===========================================================-->
+  <element name="OutputFormat"
+           type="ows:MimeType">
+    <annotation>
+      <documentation>Reference to a format in which this data can be encoded
+      and transferred. More specific parameter names should be used by
+      specific OWS specifications wherever applicable. More than one such
+      parameter can be included for different purposes.</documentation>
+    </annotation>
+  </element>
+  <!-- ===========================================================-->
+  <element name="AvailableCRS"
+           type="anyURI" />
+  <element name="SupportedCRS"
+           type="anyURI"
+           substitutionGroup="ows:AvailableCRS">
+    <annotation>
+      <documentation>Coordinate reference system in which data from this
+      data(set) or resource is available or supported. More specific parameter
+      names should be used by specific OWS specifications wherever applicable.
+      More than one such parameter can be included for different
+      purposes.</documentation>
+    </annotation>
+  </element>
+  <!-- ==========================================================
+        The following elements could be added to the IdentificationType when useful for a 
+        specific OWS. In addition the PointOfContact element in ows19115subset.xsd could 
+        be added.
+        ============================================================= -->
+  <element name="AccessConstraints"
+           type="string">
+    <annotation>
+      <documentation>Access constraint applied to assure the protection of
+      privacy or intellectual property, or any other restrictions on
+      retrieving or using data from or otherwise using this server. The
+      reserved value NONE (case insensitive) shall be used to mean no access
+      constraints are imposed.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="Fees"
+           type="string">
+    <annotation>
+      <documentation>Fees and terms for retrieving data from or otherwise
+      using this server, including the monetary units as specified in ISO
+      4217. The reserved value NONE (case insensitive) shall be used to mean
+      no fees or terms.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="Language"
+           type="language">
+    <annotation>
+      <documentation>Identifier of a language used by the data(set) contents.
+      This language identifier shall be as specified in IETF RFC 4646. The
+      language tags shall be either complete 5 character codes (e.g. "en-CA"),
+      or abbreviated 2 character codes (e.g. "en"). In addition to the RFC
+      4646 codes, the server shall support the single special value "*" which
+      is used to indicate "any language".</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsDomainType.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsDomainType.xsd
new file mode 100644
index 0000000..0b24a65
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsDomainType.xsd
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="http://www.opengis.net/ows/2.0"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsDomainType.xsd</appinfo>
+    <documentation>This XML Schema Document encodes the allowed values (or
+    domain) of a quantity, often for an input or output parameter to an OWS.
+    Such a parameter is sometimes called a variable, quantity, literal, or
+    typed literal. Such a parameter can use one of many data types, including
+    double, integer, boolean, string, or URI. The allowed values can also be
+    encoded for a quantity that is not explicit or not transferred, but is
+    constrained by a server implementation.
+    
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/
+    </documentation>
+  </annotation>
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <include schemaLocation="owsCommon.xsd" />
+  <import namespace="http://www.w3.org/1999/xlink"
+          schemaLocation="../../../w3c/1999/xlink.xsd" />
+
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <complexType name="DomainType">
+    <annotation>
+      <documentation>Valid domain (or allowed set of values) of one quantity,
+      with its name or identifier.</documentation>
+    </annotation>
+    <complexContent>
+      <extension base="ows:UnNamedDomainType">
+        <attribute name="name"
+                   type="string"
+                   use="required">
+          <annotation>
+            <documentation>Name or identifier of this
+            quantity.</documentation>
+          </annotation>
+        </attribute>
+      </extension>
+    </complexContent>
+  </complexType>
+  <!-- ========================================================== -->
+  <complexType name="UnNamedDomainType">
+    <annotation>
+      <documentation>Valid domain (or allowed set of values) of one quantity,
+      with needed metadata but without a quantity name or
+      identifier.</documentation>
+    </annotation>
+    <sequence>
+      <group ref="ows:PossibleValues" />
+      <element ref="ows:DefaultValue"
+               minOccurs="0">
+        <annotation>
+          <documentation>Optional default value for this quantity, which
+          should be included when this quantity has a default
+          value.</documentation>
+        </annotation>
+      </element>
+      <element ref="ows:Meaning"
+               minOccurs="0">
+        <annotation>
+          <documentation>Meaning metadata should be referenced or included for
+          each quantity.</documentation>
+        </annotation>
+      </element>
+      <element ref="ows:DataType"
+               minOccurs="0">
+        <annotation>
+          <documentation>This data type metadata should be referenced or
+          included for each quantity.</documentation>
+        </annotation>
+      </element>
+      <group ref="ows:ValuesUnit"
+             minOccurs="0">
+        <annotation>
+          <documentation>Unit of measure, which should be included when this
+          set of PossibleValues has units or a more complete reference
+          system.</documentation>
+        </annotation>
+      </group>
+      <element ref="ows:Metadata"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Optional unordered list of other metadata about this
+          quantity. A list of required and optional other metadata elements
+          for this quantity should be specified in the Implementation
+          Specification for this service.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+  </complexType>
+  <!-- ========================================================== -->
+  <group name="PossibleValues">
+    <annotation>
+      <documentation>Specifies the possible values of this
+      quantity.</documentation>
+    </annotation>
+    <choice>
+      <element ref="ows:AllowedValues" />
+      <element ref="ows:AnyValue" />
+      <element ref="ows:NoValues" />
+      <element ref="ows:ValuesReference" />
+    </choice>
+  </group>
+  <!-- ========================================================== -->
+  <element name="AnyValue">
+    <annotation>
+      <documentation>Specifies that any value is allowed for this
+      parameter.</documentation>
+    </annotation>
+    <complexType />
+  </element>
+  <!-- ========================================================== -->
+  <element name="NoValues">
+    <annotation>
+      <documentation>Specifies that no values are allowed for this parameter
+      or quantity.</documentation>
+    </annotation>
+    <complexType />
+  </element>
+  <!-- ========================================================== -->
+  <element name="ValuesReference">
+    <annotation>
+      <documentation>Reference to externally specified list of all the valid
+      values and/or ranges of values for this quantity. (Informative: This
+      element was simplified from the metaDataProperty element in GML
+      3.0.)</documentation>
+    </annotation>
+    <complexType>
+      <simpleContent>
+        <extension base="string">
+          <annotation>
+            <documentation>Human-readable name of the list of values provided
+            by the referenced document. Can be empty string when this list has
+            no name.</documentation>
+          </annotation>
+          <attribute ref="ows:reference"
+                     use="required" />
+        </extension>
+      </simpleContent>
+    </complexType>
+  </element>
+  <!-- ========================================================== -->
+  <group name="ValuesUnit">
+    <annotation>
+      <documentation>Indicates that this quantity has units or a reference
+      system, and identifies the unit or reference system used by the
+      AllowedValues or ValuesReference.</documentation>
+    </annotation>
+    <choice>
+      <element ref="ows:UOM">
+        <annotation>
+          <documentation>Identifier of unit of measure of this set of values.
+          Should be included then this set of values has units (and not a more
+          complete reference system).</documentation>
+        </annotation>
+      </element>
+      <element ref="ows:ReferenceSystem">
+        <annotation>
+          <documentation>Identifier of reference system used by this set of
+          values. Should be included then this set of values has a reference
+          system (not just units).</documentation>
+        </annotation>
+      </element>
+    </choice>
+  </group>
+  <!-- ========================================================== -->
+  <!-- ========================================================== -->
+  <element name="AllowedValues">
+    <annotation>
+      <documentation>List of all the valid values and/or ranges of values for
+      this quantity. For numeric quantities, signed values should be ordered
+      from negative infinity to positive infinity.</documentation>
+    </annotation>
+    <complexType>
+      <choice maxOccurs="unbounded">
+        <element ref="ows:Value" />
+        <element ref="ows:Range" />
+      </choice>
+    </complexType>
+  </element>
+  <!-- ========================================================== -->
+  <element name="Value"
+           type="ows:ValueType" />
+  <!-- ========================================================== -->
+  <complexType name="ValueType">
+    <annotation>
+      <documentation>A single value, encoded as a string. This type can be
+      used for one value, for a spacing between allowed values, or for the
+      default value of a parameter.</documentation>
+    </annotation>
+    <simpleContent>
+      <extension base="string" />
+    </simpleContent>
+  </complexType>
+  <!-- ========================================================== -->
+  <element name="DefaultValue"
+           type="ows:ValueType">
+    <annotation>
+      <documentation>The default value for a quantity for which multiple
+      values are allowed.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="Range"
+           type="ows:RangeType" />
+  <!-- ========================================================== -->
+  <complexType name="RangeType">
+    <annotation>
+      <documentation>A range of values of a numeric parameter. This range can
+      be continuous or discrete, defined by a fixed spacing between adjacent
+      valid values. If the MinimumValue or MaximumValue is not included, there
+      is no value limit in that direction. Inclusion of the specified minimum
+      and maximum values in the range shall be defined by the
+      rangeClosure.</documentation>
+    </annotation>
+    <sequence>
+      <element ref="ows:MinimumValue"
+               minOccurs="0" />
+      <element ref="ows:MaximumValue"
+               minOccurs="0" />
+      <element ref="ows:Spacing"
+               minOccurs="0">
+        <annotation>
+          <documentation>Shall be included when the allowed values are NOT
+          continuous in this range. Shall not be included when the allowed
+          values are continuous in this range.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+    <attribute ref="ows:rangeClosure"
+               use="optional">
+      <annotation>
+        <documentation>Shall be included unless the default value
+        applies.</documentation>
+      </annotation>
+    </attribute>
+  </complexType>
+  <!-- ========================================================== -->
+  <element name="MinimumValue"
+           type="ows:ValueType">
+    <annotation>
+      <documentation>Minimum value of this numeric parameter.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="MaximumValue"
+           type="ows:ValueType">
+    <annotation>
+      <documentation>Maximum value of this numeric parameter.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="Spacing"
+           type="ows:ValueType">
+    <annotation>
+      <documentation>The regular distance or spacing between the allowed
+      values in a range.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <attribute name="rangeClosure"
+             default="closed">
+    <annotation>
+      <documentation>Specifies which of the minimum and maximum values are
+      included in the range. Note that plus and minus infinity are considered
+      closed bounds.</documentation>
+    </annotation>
+    <simpleType>
+      <restriction base="NMTOKENS">
+        <enumeration value="closed">
+          <annotation>
+            <documentation>The specified minimum and maximum values are
+            included in this range.</documentation>
+          </annotation>
+        </enumeration>
+        <enumeration value="open">
+          <annotation>
+            <documentation>The specified minimum and maximum values are NOT
+            included in this range.</documentation>
+          </annotation>
+        </enumeration>
+        <enumeration value="open-closed">
+          <annotation>
+            <documentation>The specified minimum value is NOT included in this
+            range, and the specified maximum value IS included in this
+            range.</documentation>
+          </annotation>
+        </enumeration>
+        <enumeration value="closed-open">
+          <annotation>
+            <documentation>The specified minimum value IS included in this
+            range, and the specified maximum value is NOT included in this
+            range.</documentation>
+          </annotation>
+        </enumeration>
+      </restriction>
+    </simpleType>
+  </attribute>
+  <!-- ========================================================== -->
+  <!-- ========================================================== -->
+  <complexType name="DomainMetadataType">
+    <annotation>
+      <documentation>References metadata about a quantity, and provides a name
+      for this metadata. (Informative: This element was simplified from the
+      metaDataProperty element in GML 3.0.)</documentation>
+    </annotation>
+    <simpleContent>
+      <extension base="string">
+        <annotation>
+          <documentation>Human-readable name of the metadata described by
+          associated referenced document.</documentation>
+        </annotation>
+        <attribute ref="ows:reference"
+                   use="optional" />
+      </extension>
+    </simpleContent>
+  </complexType>
+  <!-- ========================================================== -->
+  <attribute name="reference"
+             type="anyURI">
+    <annotation>
+      <documentation>Reference to data or metadata recorded elsewhere, either
+      external to this XML document or within it. Whenever practical, this
+      attribute should be a URL from which this metadata can be electronically
+      retrieved. Alternately, this attribute can reference a URN for
+      well-known metadata. For example, such a URN could be a URN defined in
+      the "ogc" URN namespace.</documentation>
+    </annotation>
+  </attribute>
+  <!-- ========================================================== -->
+  <element name="Meaning"
+           type="ows:DomainMetadataType">
+    <annotation>
+      <documentation>Definition of the meaning or semantics of this set of
+      values. This Meaning can provide more specific, complete, precise,
+      machine accessible, and machine understandable semantics about this
+      quantity, relative to other available semantic information. For example,
+      other semantic information is often provided in "documentation" elements
+      in XML Schemas or "description" elements in GML objects.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="DataType"
+           type="ows:DomainMetadataType">
+    <annotation>
+      <documentation>Definition of the data type of this set of values. In
+      this case, the xlink:href attribute can reference a URN for a well-known
+      data type. For example, such a URN could be a data type identification
+      URN defined in the "ogc" URN namespace.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="ReferenceSystem"
+           type="ows:DomainMetadataType">
+    <annotation>
+      <documentation>Definition of the reference system used by this set of
+      values, including the unit of measure whenever applicable (as is
+      normal). In this case, the xlink:href attribute can reference a URN for
+      a well-known reference system, such as for a coordinate reference system
+      (CRS). For example, such a URN could be a CRS identification URN defined
+      in the "ogc" URN namespace.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+  <element name="UOM"
+           type="ows:DomainMetadataType">
+    <annotation>
+      <documentation>Definition of the unit of measure of this set of values.
+      In this case, the xlink:href attribute can reference a URN for a
+      well-known unit of measure (uom). For example, such a URN could be a UOM
+      identification URN defined in the "ogc" URN namespace.</documentation>
+    </annotation>
+  </element>
+  <!-- ========================================================== -->
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsExceptionReport.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsExceptionReport.xsd
new file mode 100644
index 0000000..52ad62a
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsExceptionReport.xsd
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/2.0"
+        xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsExceptionReport.xsd</appinfo>
+    <documentation>This XML Schema Document encodes the Exception Report
+    response to all OWS operations.
+	
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+    </documentation>
+  </annotation>
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <import namespace="http://www.w3.org/XML/1998/namespace"
+          schemaLocation="../../../w3c/2001/xml.xsd" />
+
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <element name="ExceptionReport">
+    <annotation>
+      <documentation>Report message returned to the client that requested any
+      OWS operation when the server detects an error while processing that
+      operation request.</documentation>
+    </annotation>
+    <complexType>
+      <sequence>
+        <element ref="ows:Exception"
+                 maxOccurs="unbounded">
+          <annotation>
+            <documentation>Unordered list of one or more Exception elements
+            that each describes an error. These Exception elements shall be
+            interpreted by clients as being independent of one another (not
+            hierarchical).</documentation>
+          </annotation>
+        </element>
+      </sequence>
+      <attribute name="version"
+                 use="required">
+        <annotation>
+          <documentation>Specification version for OWS operation. The string
+          value shall contain one x.y.z "version" value (e.g., "2.1.3"). A
+          version number shall contain three non-negative integers separated
+          by decimal points, in the form "x.y.z". The integers y and z shall
+          not exceed 99. Each version shall be for the Implementation
+          Specification (document) and the associated XML Schemas to which
+          requested operations will conform. An Implementation Specification
+          version normally specifies XML Schemas against which an XML encoded
+          operation response must conform and should be validated. See Version
+          negotiation subclause for more information.</documentation>
+        </annotation>
+        <simpleType>
+          <restriction base="string">
+            <pattern value="\d+\.\d?\d\.\d?\d" />
+          </restriction>
+        </simpleType>
+      </attribute>
+      <attribute ref="xml:lang"
+                 use="optional">
+        <annotation>
+          <documentation>Identifier of the language used by all included
+          exception text values. These language identifiers shall be as
+          specified in IETF RFC 4646. When this attribute is omitted, the
+          language used is not identified.</documentation>
+        </annotation>
+      </attribute>
+    </complexType>
+  </element>
+  <!-- ======================================================= -->
+  <element name="Exception"
+           type="ows:ExceptionType" />
+  <!-- ======================================================= -->
+  <complexType name="ExceptionType">
+    <annotation>
+      <documentation>An Exception element describes one detected error that a
+      server chooses to convey to the client.</documentation>
+    </annotation>
+    <sequence>
+      <element name="ExceptionText"
+               type="string"
+               minOccurs="0"
+               maxOccurs="unbounded">
+        <annotation>
+          <documentation>Ordered sequence of text strings that describe this
+          specific exception or error. The contents of these strings are left
+          open to definition by each server implementation. A server is
+          strongly encouraged to include at least one ExceptionText value, to
+          provide more information about the detected error than provided by
+          the exceptionCode. When included, multiple ExceptionText values
+          shall provide hierarchical information about one detected error,
+          with the most significant information listed first.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+    <attribute name="exceptionCode"
+               type="string"
+               use="required">
+      <annotation>
+        <documentation>A code representing the type of this exception, which
+        shall be selected from a set of exceptionCode values specified for the
+        specific service operation and server.</documentation>
+      </annotation>
+    </attribute>
+    <attribute name="locator"
+               type="string"
+               use="optional">
+      <annotation>
+        <documentation>When included, this locator shall indicate to the
+        client where an exception was encountered in servicing the client's
+        operation request. This locator should be included whenever meaningful
+        information can be provided by the server. The contents of this
+        locator will depend on the specific exceptionCode and OWS service, and
+        shall be specified in the OWS Implementation
+        Specification.</documentation>
+      </annotation>
+    </attribute>
+  </complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsGetCapabilities.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsGetCapabilities.xsd
new file mode 100644
index 0000000..02f4819
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsGetCapabilities.xsd
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="http://www.opengis.net/ows/2.0"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsGetCapabilities.xsd</appinfo>
+    <documentation>This XML Schema Document defines the GetCapabilities
+    operation request and response XML elements and types, which are common to
+    all OWSs. This XML Schema shall be edited by each OWS, for example, to
+    specify a specific value for the "service" attribute.
+    
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+    </documentation>
+  </annotation>
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <include schemaLocation="owsServiceIdentification.xsd" />
+  <include schemaLocation="owsServiceProvider.xsd" />
+  <include schemaLocation="owsOperationsMetadata.xsd" />
+
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <complexType name="CapabilitiesBaseType">
+    <annotation>
+      <documentation>XML encoded GetCapabilities operation response. This
+      document provides clients with service metadata about a specific service
+      instance, usually including metadata about the tightly-coupled data
+      served. If the server does not implement the updateSequence parameter,
+      the server shall always return the complete Capabilities document,
+      without the updateSequence parameter. When the server implements the
+      updateSequence parameter and the GetCapabilities operation request
+      included the updateSequence parameter with the current value, the server
+      shall return this element with only the "version" and "updateSequence"
+      attributes. Otherwise, all optional elements shall be included or not
+      depending on the actual value of the Contents parameter in the
+      GetCapabilities operation request. This base type shall be extended by
+      each specific OWS to include the additional contents
+      needed.</documentation>
+    </annotation>
+    <sequence>
+      <element ref="ows:ServiceIdentification"
+               minOccurs="0" />
+      <element ref="ows:ServiceProvider"
+               minOccurs="0" />
+      <element ref="ows:OperationsMetadata"
+               minOccurs="0" />
+      <element name="Languages"
+               minOccurs="0">
+        <annotation>
+          <documentation>The list of languages that this service is able to
+          fully support. That is, if one of the listed languages is requested
+          using the AcceptLanguages parameter in future requests to the
+          server, all text strings contained in the response are guaranteed to
+          be in that language. This list does not necessarily constitute a
+          complete list of all languages that may be (at least partially)
+          supported by the server. It only states the languages that are fully
+          supported. If a server cannot guarantee full support of any
+          particular language, it shall omit it from the list of supported
+          languages in the capabilities document.</documentation>
+        </annotation>
+        <complexType>
+          <sequence>
+            <element ref="ows:Language" maxOccurs="unbounded"/>
+          </sequence>
+        </complexType>
+      </element>
+    </sequence>
+    <attribute name="version"
+               type="ows:VersionType"
+               use="required" />
+    <attribute name="updateSequence"
+               type="ows:UpdateSequenceType"
+               use="optional">
+      <annotation>
+        <documentation>Service metadata document version, having values that
+        are "increased" whenever any change is made in service metadata
+        document. Values are selected by each server, and are always opaque to
+        clients. When not supported by server, server shall not return this
+        attribute.</documentation>
+      </annotation>
+    </attribute>
+  </complexType>
+  <!-- =========================================================== -->
+  <element name="GetCapabilities"
+           type="ows:GetCapabilitiesType" />
+  <!-- =========================================================== -->
+  <complexType name="GetCapabilitiesType">
+    <annotation>
+      <documentation>XML encoded GetCapabilities operation request. This
+      operation allows clients to retrieve service metadata about a specific
+      service instance. In this XML encoding, no "request" parameter is
+      included, since the element name specifies the specific operation. This
+      base type shall be extended by each specific OWS to include the
+      additional required "service" attribute, with the correct value for that
+      OWS.</documentation>
+    </annotation>
+    <sequence>
+      <element name="AcceptVersions"
+               type="ows:AcceptVersionsType"
+               minOccurs="0">
+        <annotation>
+          <documentation>When omitted, server shall return latest supported
+          version.</documentation>
+        </annotation>
+      </element>
+      <element name="Sections"
+               type="ows:SectionsType"
+               minOccurs="0">
+        <annotation>
+          <documentation>When omitted or not supported by server, server shall
+          return complete service metadata (Capabilities)
+          document.</documentation>
+        </annotation>
+      </element>
+      <element name="AcceptFormats"
+               type="ows:AcceptFormatsType"
+               minOccurs="0">
+        <annotation>
+          <documentation>When omitted or not supported by server, server shall
+          return service metadata document using the MIME type
+          "text/xml".</documentation>
+        </annotation>
+      </element>
+      <element name="AcceptLanguages"
+               minOccurs="0">
+        <annotation>
+          <documentation>Ordered list of languages desired by the client for
+          all human readable text in the response, in order of preference. For
+          every element, the first matching language available from the server
+          shall be present in the response.</documentation>
+        </annotation>
+        <complexType>
+          <sequence>
+            <element ref="ows:Language" maxOccurs="unbounded"/>
+          </sequence>
+        </complexType>
+      </element>
+    </sequence>
+    <attribute name="updateSequence"
+               type="ows:UpdateSequenceType"
+               use="optional">
+      <annotation>
+        <documentation>When omitted or not supported by server, server shall
+        return latest complete service metadata document.</documentation>
+      </annotation>
+    </attribute>
+  </complexType>
+  <!-- =========================================================== -->
+  <!-- =========================================================== -->
+  <simpleType name="ServiceType">
+    <annotation>
+      <documentation>Service type identifier, where the string value is the
+      OWS type abbreviation, such as "WMS" or "WFS".</documentation>
+    </annotation>
+    <restriction base="string" />
+  </simpleType>
+  <!-- ========================================================= -->
+  <complexType name="AcceptVersionsType">
+    <annotation>
+      <documentation>Prioritized sequence of one or more specification
+      versions accepted by client, with preferred versions listed first. See
+      Version negotiation subclause for more information.</documentation>
+    </annotation>
+    <sequence>
+      <element name="Version"
+               type="ows:VersionType"
+               maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+  <!-- =========================================================== -->
+  <complexType name="SectionsType">
+    <annotation>
+      <documentation>Unordered list of zero or more names of requested
+      sections in complete service metadata document. Each Section value shall
+      contain an allowed section name as specified by each OWS specification.
+      See Sections parameter subclause for more information.</documentation>
+    </annotation>
+    <sequence>
+      <element name="Section"
+               type="string"
+               minOccurs="0"
+               maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+  <!-- =========================================================== -->
+  <simpleType name="UpdateSequenceType">
+    <annotation>
+      <documentation>Service metadata document version, having values that are
+      "increased" whenever any change is made in service metadata document.
+      Values are selected by each server, and are always opaque to clients.
+      See updateSequence parameter use subclause for more
+      information.</documentation>
+    </annotation>
+    <restriction base="string" />
+  </simpleType>
+  <!-- =========================================================== -->
+  <complexType name="AcceptFormatsType">
+    <annotation>
+      <documentation>Prioritized sequence of zero or more GetCapabilities
+      operation response formats desired by client, with preferred formats
+      listed first. Each response format shall be identified by its MIME type.
+      See AcceptFormats parameter use subclause for more
+      information.</documentation>
+    </annotation>
+    <sequence>
+      <element name="OutputFormat"
+               type="ows:MimeType"
+               minOccurs="0"
+               maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+</schema>
diff --git a/pycsw/core/schemas/ogc/ows/2.0/owsGetResourceByID.xsd b/pycsw/core/schemas/ogc/ows/2.0/owsGetResourceByID.xsd
new file mode 100644
index 0000000..54e4231
--- /dev/null
+++ b/pycsw/core/schemas/ogc/ows/2.0/owsGetResourceByID.xsd
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema targetNamespace="http://www.opengis.net/ows/2.0"
+        xmlns:ows="http://www.opengis.net/ows/2.0"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        version="2.0.2"
+        xml:lang="en">
+  <annotation>
+    <appinfo>owsGetResourceByID.xsd</appinfo>
+    <documentation>This XML Schema Document encodes the GetResourceByID
+    operation request message. This typical operation is specified as a base
+    for profiling in specific OWS specifications. For information on the
+    allowed changes and limitations in such profiling, see Subclause 9.4.1 of
+    the OWS Common specification.
+    
+    OWS is an OGC Standard.
+    Copyright (c) 2009 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+    </documentation>
+  </annotation>
+  <!-- ==============================================================
+                includes and imports
+        ============================================================== -->
+  <include schemaLocation="owsAll.xsd"/>
+  <include schemaLocation="owsDataIdentification.xsd" />
+  <include schemaLocation="owsGetCapabilities.xsd" />
+
+  <!-- ==============================================================
+                elements and types
+        ============================================================== -->
+  <element name="Resource">
+    <annotation>
+      <documentation>XML encoded GetResourceByID operation response. The
+      complexType used by this element shall be specified by each specific
+      OWS.</documentation>
+    </annotation>
+  </element>
+  <!-- =========================================================== -->
+  <element name="GetResourceByID"
+           type="ows:GetResourceByIdType"></element>
+  <!-