Add predicate dispatch for use with handlers