Added basic XML support