Refactoring module and custom filter