Make creator work with new format