Moved filters into a separate module