Minor changes to optional