XMLReader refactured.  Model updated.