Move filters methods to a separate module