Finish re-writing data formats