Shouldn't we have a new xsd specifically for 7.0 instead?