Use variable hierarchy and add more tasks