(#4) - Add filter function option