Added new base XSD and changed file handling