xml oxm refactoring