Hotfix/xml parsing