Initial changes to add XML R/W