Added support for entity-level policies