CFY-1295 add module based tasks support