Added statistics and tagging