Re-add task factory