Work finished on XML parsing