Improved xsd and added primitive xml output