xsd schema changes in preperation for multifield template matching.