Since we have this new mechanism, use it for policies as well.