Changes to ObervHandler and XMLReader