Updated the save methods to the new YML format