Support enclosure and category tags

Closes #16.