Security: Switched to xml