More aggressive matches
Make configurable