Refactored filter registration