Added features to tag system