Rename and add validateOperation