Added create task support