Final changes to allow storing values back in XML