Updated tagging for arrows