Add policy ID and version to metadata