Implemented additional tags.

Closes #1