More work on XML parsing