Add Policy Enforcement on discovery