Added a conversion between old format and new