OSDF migration to new Policy API