Updated model classes and xsd