Updated to use XML backend and not a database