Adds support for simple tags

Change-Id: I285e4b73df0a7112bbde7ef13eddf8fdccf59178
7 files changed