Refactored operations