Implement exclusions
Refactoring