Added tagging + new fields