Refactored tasks for Plugin awareness