Added Task passing support.