Updted xsd file and scenario package