Phase 1 of improved exclude framework