Added 1.5-style tag support