Split up of PredicateProvider into PredicateProvider and PredicateHandler (incomplete)