Fix XSD path
Model enhancements
Preliminary editing