Add data seting and fix some xml misspale