Update new configuration.xml file
Update doc and change some methods.