Refactored operation wrapper