Migration to new format