Updated policy and tagging code