Enhancement sample demo tutorial, add xsd definition