Add format and save methods