Support several more tags and structures.