Fixing implementation artifacts and adding PolicyRef to policies