XSD refactoring and database changes