I changed my mind. I will add the new code and make sure it works even without the policy files. :)