Try to solve the conflict problem
Update model name following the xml
Test for reflactor xml parsing