change operation values to be optional