Added support for tags.

I forgot the tag/attribute format piece. So I added it.