Add predicate support for multitenancy