BS-1998, add support to subtasks