adding single task support