Added task-based executor