added complex key test in xml converter
Merge origin/master
code improvements and fallback to generic elements in xml introduced