Modified XML parser