Added more options to output format and storage.