Added unless isexcluded to all exclusions