Adapt to the new format