Add new option: store_empty_body