Replaced Function instances with Predicates