Corrections toXML -> Dictionary conversion for new changes.