Update to new format