No, inclusion of non-charging measures varies across the packages considered. Further detail can be found in the the SOC.