Updated for compatibility with _60.xml files