Final branch commit. Rename XMLParser class to DataParser.