Modified files to use OpOperation