Changed xsd and namepaces accordingly