save_objects refactor