Added tags and code for the tags