Added Option back to optional response fields