Update for Steve's XML generator plugin