Added support to multi tasks