Adding multiple task support