Updated xml and xsd files