Add naive tag handling