Config.xml -> new format