We should update the XML and PHP formats here as well