[PD-dev] XML again