Convert to new format