Adding support for tags into the policy definition files