Added more exclusion checks