Switching over to xml