New implementation based on XML.