Structural changes to allow for conditional inclusion/exclusion of content