Refactor with filter rules files