Add faster process for tagging