Added file_storage param.