Adjusted XML dump classes to the new schema.