Enhance detection
Add excluded items