Switch to XML storage format