Make predicate more generic, change default predicate