Rework exclusion logic