Updated tag structure