Switch updating to optional