Updates based on TT agreements and mods to espiderived.xsd