New xml files and Bugfixes