Added XMLParser and wrapper objects