Model updates for XSD profile