Add tagging for correct time