Added additional path filtering.