Prep for policy persistence