Refactoring: move filter implementation directly to the pointcuts