Added more exclusions