Refactored tasks