Added support for a few more tags.