Refacored policy files to make them dry